提交代码

yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/wechat/WxController.java

@@ -154,6 +154,7 @@ public class WxController extends BaseController {
     @PostMapping("/submitUserSignets")
     public AjaxResult submitUserSignets(@RequestBody SignetFileVo signetFileVo)
     {
-        return success(proProjectInfoSubdeptsUsersService.submitUserSignets(signetFileVo));
+        proProjectInfoSubdeptsUsersService.submitUserSignets(signetFileVo);
+        return success();
     }
 }

yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IProProjectInfoSubdeptsUsersService.java

@@ -76,13 +76,18 @@ public interface IProProjectInfoSubdeptsUsersService
      * @param signetFileVo
      */
     public void submitUserSignets(SignetFileVo signetFileVo);
-=======
+
+    /**
      * 大屏-项目详情-在岗人员统计
+     * @param proProjectInfoSubdeptsUsers
+     * @return
      */
     List<ProProjectInfoSubdeptsUsers> groupByCraftType(ProProjectInfoSubdeptsUsers proProjectInfoSubdeptsUsers);
+
     /**
      * 大屏-项目详情-今日出勤期统计
+     * @param where
+     * @return
      */
     List<ProProjectInfoSubdeptsUsers> groupByCraftTypeByAttendance(ProProjectInfoSubdeptsUsers where);
->>>>>>> 3346e22d2f988d229f7f3b6452dc4da643a03251
 }

yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java

@@ -136,7 +136,6 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu
         uniService.syncUserRevoke(id);
         return proProjectInfoSubdeptsUsersMapper.deleteProProjectInfoSubdeptsUsersById(id);
     }
-<<<<<<< HEAD
 
     /**
      * 查询用户在项目中的信息
@@ -162,18 +161,19 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu
      */
     @Override
     @Transactional
-    public void submitUserSignets(SignetFileVo signetFileVo){
+    public void submitUserSignets(SignetFileVo signetFileVo) {
         ProProjectInfoSubdeptsUsers query = new ProProjectInfoSubdeptsUsers();
         query.setProjectId(signetFileVo.getProId());
         query.setPhoneNumber(signetFileVo.getUserPhone());
         List<ProProjectInfoSubdeptsUsers> dataList = proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersList(query);
-        if(StringUtils.isEmpty(dataList)){
+        if (StringUtils.isEmpty(dataList)) {
             throw new ServiceException("用户信息异常...");
         }
         ProProjectInfoSubdeptsUsers proSubdeptsUser = dataList.get(0);
         proSubdeptsUser.setSubStep(100L);
         proSubdeptsUser.setEduSignPath(signetFileVo.getImgPath());
-=======
+    }
+
     /**
      * 大屏-项目详情-在岗人员统计
      */
@@ -181,12 +181,13 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu
     public List<ProProjectInfoSubdeptsUsers> groupByCraftType(ProProjectInfoSubdeptsUsers proProjectInfoSubdeptsUsers) {
         return proProjectInfoSubdeptsUsersMapper.groupByCraftType(proProjectInfoSubdeptsUsers);
     }
+
     /**
      * 大屏-项目详情-今日出勤期统计
      */
     @Override
     public List<ProProjectInfoSubdeptsUsers> groupByCraftTypeByAttendance(ProProjectInfoSubdeptsUsers where) {
         return proProjectInfoSubdeptsUsersMapper.groupByCraftTypeByAttendance(where);
->>>>>>> 3346e22d2f988d229f7f3b6452dc4da643a03251
     }
+
 }