瀏覽代碼

问卷调查乐器置换

zouxuan 4 年之前
父節點
當前提交
da45ea675d

+ 2 - 1
mec-biz/src/main/java/com/ym/mec/biz/dal/dao/ReplacementInstrumentActivityDao.java

@@ -5,5 +5,6 @@ import com.ym.mec.common.dal.BaseDAO;
 
 public interface ReplacementInstrumentActivityDao extends BaseDAO<Integer, ReplacementInstrumentActivity> {
 
-	
+
+    ReplacementInstrumentActivity findByUserId(Integer userId);
 }

+ 17 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/page/ReplacementInstrumentActivityQueryInfo.java

@@ -0,0 +1,17 @@
+package com.ym.mec.biz.dal.page;
+
+
+import com.ym.mec.common.page.QueryInfo;
+
+public class ReplacementInstrumentActivityQueryInfo extends QueryInfo {
+
+    private String organId;
+
+    public String getOrganId() {
+        return organId;
+    }
+
+    public void setOrganId(String organId) {
+        this.organId = organId;
+    }
+}

+ 3 - 0
mec-biz/src/main/java/com/ym/mec/biz/service/ReplacementInstrumentActivityService.java

@@ -5,4 +5,7 @@ import com.ym.mec.common.service.BaseService;
 
 public interface ReplacementInstrumentActivityService extends BaseService<Integer, ReplacementInstrumentActivity> {
 
+    Object add(ReplacementInstrumentActivity replacementInstrumentActivity);
+
+    ReplacementInstrumentActivity findByUserId(Integer userId);
 }

+ 30 - 1
mec-biz/src/main/java/com/ym/mec/biz/service/impl/ReplacementInstrumentActivityServiceImpl.java

@@ -1,6 +1,9 @@
 package com.ym.mec.biz.service.impl;
 
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import com.ym.mec.biz.dal.entity.ReplacementInstrumentActivity;
@@ -13,10 +16,36 @@ public class ReplacementInstrumentActivityServiceImpl extends BaseServiceImpl<In
 	
 	@Autowired
 	private ReplacementInstrumentActivityDao replacementInstrumentActivityDao;
+	@Autowired
+	private SysUserFeignService sysUserFeignService;
 
 	@Override
 	public BaseDAO<Integer, ReplacementInstrumentActivity> getDAO() {
 		return replacementInstrumentActivityDao;
 	}
-	
+
+	@Override
+	public Object add(ReplacementInstrumentActivity replacementInstrumentActivity) {
+		SysUser sysUser = sysUserFeignService.queryUserInfo();
+		if (sysUser == null) {
+			throw new BizException("用户信息获取失败,请重新登陆");
+		}
+		replacementInstrumentActivity.setUserId(sysUser.getId());
+		//如果用户是43分部,那么修改用户信息
+		//如果提交过调查问卷,那么覆盖之前的记录
+		ReplacementInstrumentActivity activity = replacementInstrumentActivityDao.findByUserId(sysUser.getId());
+		if(activity != null){
+			//覆盖之前的数据
+			replacementInstrumentActivity.setId(activity.getId());
+			replacementInstrumentActivityDao.update(replacementInstrumentActivity);
+		}else {
+			replacementInstrumentActivityDao.insert(replacementInstrumentActivity);
+		}
+		return replacementInstrumentActivity;
+	}
+
+	@Override
+	public ReplacementInstrumentActivity findByUserId(Integer userId) {
+		return replacementInstrumentActivityDao.findByUserId(userId);
+	}
 }

+ 3 - 0
mec-biz/src/main/resources/config/mybatis/ReplacementInstrumentActivityMapper.xml

@@ -87,4 +87,7 @@
 	<select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM replacement_instrument_activity
 	</select>
+	<select id="findByUserId" resultMap="ReplacementInstrumentActivity">
+		SELECT * FROM replacement_instrument_activity WHERE user_id_ = #{userId} LIMIT 1
+	</select>
 </mapper>

+ 91 - 0
mec-student/src/main/java/com/ym/mec/student/controller/ReplacementInstrumentActivityController.java

@@ -0,0 +1,91 @@
+package com.ym.mec.student.controller;
+
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.dao.EmployeeDao;
+import com.ym.mec.biz.dal.entity.Employee;
+import com.ym.mec.biz.dal.entity.ReplacementInstrumentActivity;
+import com.ym.mec.biz.dal.entity.Student;
+import com.ym.mec.biz.dal.page.ReplacementInstrumentActivityQueryInfo;
+import com.ym.mec.biz.service.ReplacementInstrumentActivityService;
+import com.ym.mec.biz.service.StudentService;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.exception.BizException;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Arrays;
+import java.util.List;
+
+@RequestMapping("replacementInstrumentActivity")
+@Api(tags = "收费类型服务")
+@RestController
+public class ReplacementInstrumentActivityController extends BaseController {
+
+    @Autowired
+    private ReplacementInstrumentActivityService replacementInstrumentActivityService;
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
+    @Autowired
+    private StudentService studentService;
+
+    @ApiOperation(value = "新增调查问卷")
+    @PostMapping("/insert")
+    public Object add(ReplacementInstrumentActivity replacementInstrumentActivity) {
+        return succeed(replacementInstrumentActivityService.add(replacementInstrumentActivity));
+    }
+
+    @ApiOperation(value = "获取学员基本信息")
+    @GetMapping("queryUserInfo")
+    public Object queryUserInfo(Integer cooperationOrganId) {
+        SysUser user = sysUserFeignService.queryUserInfo();
+        if (user == null) {
+            return failed(HttpStatus.FORBIDDEN, "请登录");
+        }
+        ReplacementInstrumentActivity replacementInstrumentActivity = replacementInstrumentActivityService.findByUserId(user.getId());
+        if(replacementInstrumentActivity == null){
+            Student student = studentService.get(user.getId());
+            replacementInstrumentActivity = new ReplacementInstrumentActivity();
+            replacementInstrumentActivity.setUserId(user.getId());
+            replacementInstrumentActivity.setClasses(student.getCurrentClass());
+            replacementInstrumentActivity.setGrade(student.getCurrentGradeNum().toString());
+            replacementInstrumentActivity.setCooperationOrganId(cooperationOrganId);
+            replacementInstrumentActivity.setUserName(StringUtils.isEmpty(user.getUsername())?user.getRealName():user.getUsername());
+            replacementInstrumentActivity.setMobileNo(user.getPhone());
+            String subjectIdList = student.getSubjectIdList();
+            if(StringUtils.isNotEmpty(subjectIdList)){
+                replacementInstrumentActivity.setSubjectId(Integer.parseInt(subjectIdList.split(",")[0]));
+            }
+        }
+        return replacementInstrumentActivity;
+    }
+
+    @ApiOperation(value = "修改调查问卷")
+    @PostMapping("/update")
+    public Object update (ReplacementInstrumentActivity replacementInstrumentActivity) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            throw new BizException("用户信息获取失败,请重新登陆");
+        }
+        replacementInstrumentActivityService.update(replacementInstrumentActivity);
+        return succeed();
+    }
+
+    @ApiOperation(value = "获取调查问卷")
+    @GetMapping("/get")
+    public Object get (Integer id) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            throw new BizException("用户信息获取失败,请重新登陆");
+        }
+        return succeed(replacementInstrumentActivityService.get(id));
+    }
+}

+ 38 - 0
mec-web/src/main/java/com/ym/mec/web/controller/ReplacementInstrumentActivityController.java

@@ -1,12 +1,25 @@
 package com.ym.mec.web.controller;
 
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.dao.EmployeeDao;
+import com.ym.mec.biz.dal.entity.Employee;
+import com.ym.mec.biz.dal.page.ManagerDownloadQueryInfo;
+import com.ym.mec.biz.dal.page.ReplacementInstrumentActivityQueryInfo;
 import com.ym.mec.biz.service.ReplacementInstrumentActivityService;
 import com.ym.mec.common.controller.BaseController;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Arrays;
+import java.util.List;
+
 @RequestMapping("replacementInstrumentActivity")
 @Api(tags = "收费类型服务")
 @RestController
@@ -14,5 +27,30 @@ public class ReplacementInstrumentActivityController extends BaseController {
 
     @Autowired
     private ReplacementInstrumentActivityService replacementInstrumentActivityService;
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
+    @Autowired
+    private EmployeeDao employeeDao;
 
+    @ApiOperation(value = "分页查询列表")
+    @GetMapping("/queryPage")
+    @PreAuthorize("@pcs.hasPermissions('managerDownload/queryPage')")
+    public Object queryPage(ReplacementInstrumentActivityQueryInfo queryInfo) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed("用户信息获取失败");
+        }
+        Employee employee = employeeDao.get(sysUser.getId());
+        if (StringUtils.isEmpty(queryInfo.getOrganId())) {
+            queryInfo.setOrganId(employee.getOrganIdList());
+        }else if(StringUtils.isEmpty(employee.getOrganIdList())){
+            return failed("用户所在分部异常");
+        }else {
+            List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
+            if(!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))){
+                return failed("非法请求");
+            }
+        }
+        return succeed(replacementInstrumentActivityService.queryPage(queryInfo));
+    }
 }