jiangyq
/
YZProjectCloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

dev_xd
姜玉琦 2024-12-17 20:31:07 +08:00
parent 355d94c1b5
commit 7c8e5aac33
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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();
}
}

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

@ -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
}

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

@ -136,7 +136,6 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu
uniService.syncUserRevoke(id);
return proProjectInfoSubdeptsUsersMapper.deleteProProjectInfoSubdeptsUsersById(id);
}
<<<<<<< HEAD
/**
* 查询用户在项目中的信息
@ -173,7 +172,8 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu
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
}
}