diff --git a/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/utils/face/ArcFaceHelper.java b/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/utils/face/ArcFaceHelper.java index 60b9714..a40b463 100644 --- a/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/utils/face/ArcFaceHelper.java +++ b/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/utils/face/ArcFaceHelper.java @@ -15,11 +15,12 @@ import java.util.ArrayList; import java.util.List; /** + * 虹软 * 人脸识别工具类 * @author zys */ public class ArcFaceHelper { - + private static final String APP_ID = "52XE2dQBtdmMsfDMvyKmPCD1nGBSGQWQGUyJh5z9JhND"; /** * win @@ -29,9 +30,9 @@ public class ArcFaceHelper { * linux */ private static final String LINUX64_SDK_KEY = "GggpcEphVxXLXcpEZz6tdC19evqXbbhMyYt71DGLwnCp"; - + private static FaceEngine faceEngine = null; - + public static final float STANDARD_SCORE = 0.85F; public static int errorCode = 0; @@ -108,7 +109,7 @@ public class ArcFaceHelper { } //人脸检测 List lstFaceInfo = new ArrayList<>(); - faceEngine.detectFaces(imageInfo.getRgbData(), imageInfo.getWidth(), imageInfo.getHeight(), + faceEngine.detectFaces(imageInfo.getRgbData(), imageInfo.getWidth(), imageInfo.getHeight(), ImageFormat.CP_PAF_BGR24, lstFaceInfo); System.out.println("检测到人脸数：" + lstFaceInfo.size()); if (lstFaceInfo.isEmpty()) { @@ -117,13 +118,13 @@ public class ArcFaceHelper { FaceResult result = new FaceResult(); //提取人脸特征 FaceFeature faceFeature = new FaceFeature(); - int code = faceEngine.extractFaceFeature(imageInfo.getRgbData(), imageInfo.getWidth(), imageInfo.getHeight(), + int code = faceEngine.extractFaceFeature(imageInfo.getRgbData(), imageInfo.getWidth(), imageInfo.getHeight(), ImageFormat.CP_PAF_BGR24, lstFaceInfo.get(0), faceFeature); System.out.println("提取特征结果码：" + code); result.setFeatures(faceFeature.getFeatureData()); //人脸信息检测 - int processCode = faceEngine.process(imageInfo.getRgbData(), imageInfo.getWidth(), imageInfo.getHeight(), - ImageFormat.CP_PAF_BGR24, lstFaceInfo, + int processCode = faceEngine.process(imageInfo.getRgbData(), imageInfo.getWidth(), imageInfo.getHeight(), + ImageFormat.CP_PAF_BGR24, lstFaceInfo, FunctionConfiguration.builder().supportAge(true).supportFace3dAngle(true).supportGender(true).build()); System.out.println("人脸信息检测码：" + processCode); if(code != 0 || processCode != 0){ @@ -186,7 +187,7 @@ public class ArcFaceHelper { int code = faceEngine.unInit(); System.out.println("销毁引擎：" + code); } - + public static ImageInfo getRGBData(File file) { if (file == null){ return null; @@ -232,7 +233,7 @@ public class ArcFaceHelper { // TODO: handle exception System.err.println(e.toString()); } - + //获取rgb数据 imageInfo.setRgbData(((DataBufferByte) (dstImage.getRaster().getDataBuffer())).getData()); return imageInfo; @@ -299,5 +300,5 @@ public class ArcFaceHelper { } return file; } - + } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmToDoController.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmToDoController.java new file mode 100644 index 0000000..56a7e54 --- /dev/null +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmToDoController.java @@ -0,0 +1,96 @@ +package com.bonus.bmw.controller; + +import com.bonus.bmw.domain.vo.PmToDoVo; +import com.bonus.bmw.service.PmToDoService; +import com.bonus.common.core.web.controller.BaseController; +import com.bonus.common.core.web.domain.AjaxResult; +import com.bonus.common.core.web.page.TableDataInfo; +import com.bonus.common.log.annotation.SysLog; +import com.bonus.common.log.enums.OperaType; +import com.bonus.common.security.annotation.InnerAuth; +import com.bonus.common.security.annotation.RequiresPermissionsOrInnerAuth; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import static com.bonus.bmw.utils.OwnPermissionUtil.dealWithPermission; + +/** +* 待办列表控制层 +* +* @author fly +*/ +@Slf4j +@RestController +@RequestMapping("/todo") +public class PmToDoController extends BaseController { + /** + * 服务对象 + */ + @Autowired + private PmToDoService service; + + /** + * 查询列表 + */ + @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth) + @GetMapping("/list") + @SysLog(title = "待办列表", businessType = OperaType.QUERY, logType = 0, module = "分包商管理->待办列表") + public TableDataInfo list(PmToDoVo o) { + try { + Map map = dealWithPermission(); + if(!map.isEmpty()){ + // 3. 将 map 中的值复制到 o 对象中 + org.apache.commons.beanutils.BeanUtils.populate(o, map); + } + startPage(); + List list = service.selectTodoList(o); + return getDataTable(list); + } catch (Exception e) { + log.error(e.toString(), e); + } + return getDataTableError(new ArrayList<>()); + } + + @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth) + @PostMapping("/getToDoNum") + @SysLog(title = "获取待办列表数量", businessType = OperaType.UPDATE, logType = 0, module = "施工人员->出入场管理->获取待办列表数量", details = "获取待办列表数量") + public AjaxResult getToDoNum(@RequestBody PmToDoVo o) { + try { + Map map = dealWithPermission(); + //TODO 如果是总公司人员，不给提示直接返回0 + if(!map.isEmpty()){ + // 3. 将 map 中的值复制到 o 对象中 + org.apache.commons.beanutils.BeanUtils.populate(o, map); + } + int m = service.getToDoNum(o); + return toAjax(m); + } catch (Exception e) { + logger.error(e.toString(), e); + } + return error("系统异常,请联系管理员"); + } + + @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth) + @PostMapping("/updateTodoStatus") + @SysLog(title = "修改待办列表状态", businessType = OperaType.UPDATE, logType = 0, module = "施工人员->出入场管理->修改待办列表状态", details = "修改待办列表状态") + public AjaxResult updateTodoStatus(@RequestBody PmToDoVo o) { + try { + int m = service.updateTodoStatus(o); + if (m>0){ + return success("修改成功"); + }else { + return error("修改失败"); + } + } catch (Exception e) { + logger.error(e.toString(), e); + } + return error("系统异常,请联系管理员"); + } + + +} diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmWorkerController.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmWorkerController.java index b9e054b..40fd083 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmWorkerController.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmWorkerController.java @@ -395,5 +395,25 @@ public class PmWorkerController extends BaseController { return error("系统异常,请联系管理员"); } + /** + * 查询入场人员文件缺失情况 + * @param o + * @return + * + */ + @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false)) + @GetMapping("/getWorkerFileMsg") + @SysLog(title = "查询入场人员文件缺失情况", businessType = OperaType.QUERY, logType = 0, module = "施工人员->出入场管理->查询入场人员文件缺失情况", details = "查询入场人员文件缺失情况") + public TableDataInfo getWorkerFileMsg(PmWorkerDto o) { + try { + startPage(); + List list = service.getWorkerFileMsg(o); + return getDataTable(list); + } catch (Exception e) { + logger.error(e.toString(), e); + } + return getDataTableError(new ArrayList<>()); + } + } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/dto/PmWorkerDto.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/dto/PmWorkerDto.java index 211a679..c985de1 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/dto/PmWorkerDto.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/dto/PmWorkerDto.java @@ -50,6 +50,11 @@ public class PmWorkerDto { */ private Integer teamId; + /** + * 班组名称 + */ + private String teamName; + /** * 岗位名称 */ diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/PmToDoVo.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/PmToDoVo.java new file mode 100644 index 0000000..5b3beb0 --- /dev/null +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/PmToDoVo.java @@ -0,0 +1,73 @@ +package com.bonus.bmw.domain.vo; + +import lombok.Data; + +@Data +public class PmToDoVo { + /** + * + */ + private Integer id; + + /** + * + */ + private String ids; + + /** + * 1 补卡审核 2 合同修改提醒 + */ + private String type; + + /** + * 关联数据主键 + */ + private String dataKey; + + /** + * 状态 0 未读 1 已读 2 关联主表状态 + */ + private String status; + + /** + * 分公司Id + */ + private Integer subComId; + + /** + * 组织Id + */ + private String orgId; + + /** + * 工程Id + */ + private Integer proId; + + /** + * 工人Id + */ + private Integer workerId; + + /** + * 消息 + */ + private String content; + + /** + * 修改人 + */ + private String updateUser; + + /** + * 创建时间 + */ + private String createTime; + + /** + * + */ + private Integer isActive; + + private String proName; +} diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/PmWorker.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/PmWorker.java index afbf9a5..f1f60d6 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/PmWorker.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/PmWorker.java @@ -226,4 +226,10 @@ public class PmWorker { @Excel(name = "银行联号", type = Excel.Type.IMPORT) private String bankIdentifierCode; + private String faceFile; + + private String contractFile; + + private String wageFile; + } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/BmWorkerContractMapper.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/BmWorkerContractMapper.java index a584f6b..fed8d5b 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/BmWorkerContractMapper.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/BmWorkerContractMapper.java @@ -1,6 +1,7 @@ package com.bonus.bmw.mapper; import com.bonus.bmw.domain.vo.BmWorkerContract; +import com.bonus.bmw.domain.vo.PmToDoVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -65,4 +66,8 @@ public interface BmWorkerContractMapper { * @param workerId */ void updateEinDayRecordContractId(@Param("oldContractId") Integer id,@Param("workerId") Integer workerId,@Param("contractId") Integer contractId); + + BmWorkerContract getContractById(Integer id); + + void insertToDoList(PmToDoVo pmToDoVo); } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmToDoMapper.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmToDoMapper.java new file mode 100644 index 0000000..15ef01a --- /dev/null +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmToDoMapper.java @@ -0,0 +1,16 @@ +package com.bonus.bmw.mapper; + +import com.bonus.bmw.domain.vo.PmToDoVo; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface PmToDoMapper { + + List selectTodoList(PmToDoVo o); + + int getToDoNum(PmToDoVo o); + + int updateTodoStatus(List list); +} diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmWorkerMapper.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmWorkerMapper.java index dbe0c8f..610ac20 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmWorkerMapper.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmWorkerMapper.java @@ -170,4 +170,6 @@ public interface PmWorkerMapper { * @param record */ void updateWorkerPost(PmWorker record); + + List getWorkerFileMsg(PmWorkerDto o); } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/RepairCardApplyMapper.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/RepairCardApplyMapper.java index c624bde..066c895 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/RepairCardApplyMapper.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/RepairCardApplyMapper.java @@ -3,6 +3,7 @@ package com.bonus.bmw.mapper; import com.bonus.bmw.domain.dto.*; import com.bonus.bmw.domain.po.MapBeanPo; import com.bonus.bmw.domain.po.PmProject; +import com.bonus.bmw.domain.vo.PmToDoVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -58,4 +59,11 @@ public interface RepairCardApplyMapper { List getRepairCardApplyByProMonth(RepairCardApplyDto cardApplyDto); String getSalaryStatus(RepairCardApplyDto cardApplyDto); + /** + * 获取项目所属组织信息 + * + * @param proId + * @return + */ + PmToDoVo getProUnderMsgByProId(Integer proId); } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/PmToDoService.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/PmToDoService.java new file mode 100644 index 0000000..5a51798 --- /dev/null +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/PmToDoService.java @@ -0,0 +1,15 @@ +package com.bonus.bmw.service; + +import com.bonus.bmw.domain.vo.PmToDoVo; + +import java.util.List; + +public interface PmToDoService{ + + + List selectTodoList(PmToDoVo o); + + int getToDoNum(PmToDoVo o); + + int updateTodoStatus(PmToDoVo o); +} diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/PmWorkerService.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/PmWorkerService.java index 1e6e362..f240d79 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/PmWorkerService.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/PmWorkerService.java @@ -47,4 +47,12 @@ public interface PmWorkerService{ AjaxResult insertProEin(PmWorker o, List listFile); String workerManyEinImport(List workerList); + + /** + * 查询入场人员文件缺失情况 + * @param o + * @return + * + */ + List getWorkerFileMsg(PmWorkerDto o); } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/BmWorkerContractServiceImpl.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/BmWorkerContractServiceImpl.java index 32c6e64..262fb48 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/BmWorkerContractServiceImpl.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/BmWorkerContractServiceImpl.java @@ -2,6 +2,7 @@ package com.bonus.bmw.service.impl; import com.bonus.bmw.domain.dto.WebFileDto; import com.bonus.bmw.domain.vo.BmWorkerContract; +import com.bonus.bmw.domain.vo.PmToDoVo; import com.bonus.bmw.mapper.BmWorkerContractMapper; import com.bonus.bmw.service.BmWorkerContractService; import com.bonus.common.core.constant.Constants; @@ -46,6 +47,23 @@ public class BmWorkerContractServiceImpl implements BmWorkerContractService{ public int updateByPrimaryKey(BmWorkerContract record, List listFile) { //如果有旧的有效合同执行删除 if(record.getId() != null){ + //如果修改了名字就保存记录,并且将以前别的表存的静态name修改 20251226 + BmWorkerContract o = mapper.getContractById(record.getId()); + //是否修改了合同额 + if(record.getWageCriterion() != null && !record.getWageCriterion().equals(o.getWageCriterion())){ + PmToDoVo pmToDoVo = new PmToDoVo(); + pmToDoVo.setType("2"); + pmToDoVo.setDataKey(record.getId().toString()); + pmToDoVo.setStatus("0"); + pmToDoVo.setSubComId(o.getSubComId()); + pmToDoVo.setOrgId(o.getOrgId()); + pmToDoVo.setProId(o.getProId()); + pmToDoVo.setWorkerId(o.getWorkerId()); + pmToDoVo.setContent("施工人员 "+o.getName()+" 的合同已被 "+SecurityUtils.getLoginUser().getSysUser().getNickName() + + " 修改,合同金额被从 "+o.getWageCriterion()+" 修改为 " + record.getWageCriterion()); + pmToDoVo.setUpdateUser(SecurityUtils.getLoginUser().getSysUser().getNickName()); + mapper.insertToDoList(pmToDoVo); + } deleteByPrimaryKey(record.getId()); } record.setCreateUser(SecurityUtils.getUsername()); diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmToDoServiceImpl.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmToDoServiceImpl.java new file mode 100644 index 0000000..509a313 --- /dev/null +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmToDoServiceImpl.java @@ -0,0 +1,39 @@ +package com.bonus.bmw.service.impl; + +import com.bonus.bmw.domain.vo.PmToDoVo; +import com.bonus.bmw.mapper.PmToDoMapper; +import com.bonus.bmw.service.PmToDoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Arrays; +import java.util.List; + +@Service +public class PmToDoServiceImpl implements PmToDoService{ + + @Autowired + private PmToDoMapper mapper; + + + @Override + public List selectTodoList(PmToDoVo o) { + return mapper.selectTodoList(o); + } + + @Override + public int getToDoNum(PmToDoVo o) { + return mapper.getToDoNum(o); + } + + @Override + public int updateTodoStatus(PmToDoVo o) { + String[] split = o.getIds().split(","); + List list = Arrays.asList(split); + if (!list.isEmpty()){ + return mapper.updateTodoStatus(list); + }else { + return 0; + } + } +} diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmWorkerServiceImpl.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmWorkerServiceImpl.java index d89bb01..f1dd83c 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmWorkerServiceImpl.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmWorkerServiceImpl.java @@ -29,10 +29,7 @@ import javax.validation.Validator; import java.time.LocalDate; import java.time.Period; import java.time.format.DateTimeFormatter; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; @Service @@ -373,6 +370,11 @@ public class PmWorkerServiceImpl implements PmWorkerService{ return successMsg.toString(); } + @Override + public List getWorkerFileMsg(PmWorkerDto o) { + return mapper.getWorkerFileMsg(o); + } + private void importEinData(PmWorker worker) { Integer a = mapper.getProIdByProName(worker.getProName()); Integer b = mapper.getSubIdBySubName(worker.getSubName()); diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/RepairCardApplyServiceImpl.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/RepairCardApplyServiceImpl.java index 4a5b942..2ba8ecb 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/RepairCardApplyServiceImpl.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/RepairCardApplyServiceImpl.java @@ -3,6 +3,8 @@ package com.bonus.bmw.service.impl; import com.bonus.bmw.domain.dto.*; import com.bonus.bmw.domain.po.MapBeanPo; import com.bonus.bmw.domain.po.PmProject; +import com.bonus.bmw.domain.vo.PmToDoVo; +import com.bonus.bmw.mapper.BmWorkerContractMapper; import com.bonus.bmw.mapper.PmProjectMapper; import com.bonus.bmw.mapper.RepairCardApplyMapper; import com.bonus.bmw.service.RepairCardApplyService; @@ -14,7 +16,9 @@ import com.bonus.common.security.utils.SecurityUtils; import com.bonus.system.api.model.UploadFileVo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.time.LocalDate; @@ -34,6 +38,9 @@ public class RepairCardApplyServiceImpl implements RepairCardApplyService { @Resource private RepairCardApplyMapper repairCardApplyMapper; + @Autowired + private BmWorkerContractMapper contractMapper; + @Resource private PmProjectMapper pmProjectMapper; @@ -126,11 +133,22 @@ public class RepairCardApplyServiceImpl implements RepairCardApplyService { return repairCardApplyMapper.workPersonList(cardApply); } + @Transactional @Override public AjaxResult saverepairCardApply(RepairCardApplyDto cardApplyDto, FileBasicMsgDto fileBasicMsgDto) { cardApplyDto.setApplyUser(SecurityUtils.getLoginUser().getUsername()); Integer num = repairCardApplyMapper.saverepairCardApply(cardApplyDto); if (num > 0) { + //补卡申请的审核提示添加到待办事项 + PmToDoVo pmToDoVo = repairCardApplyMapper.getProUnderMsgByProId(cardApplyDto.getProId()); + pmToDoVo.setType("1"); + pmToDoVo.setDataKey(String.valueOf(cardApplyDto.getId())); + pmToDoVo.setStatus("2"); + pmToDoVo.setContent(SecurityUtils.getLoginUser().getSysUser().getNickName() + + " 提交了工程 "+ pmToDoVo.getProName() +" 的补卡申请，请前往审核确认"); + pmToDoVo.setUpdateUser(SecurityUtils.getLoginUser().getSysUser().getNickName()); + contractMapper.insertToDoList(pmToDoVo); + repairCardApplyMapper.saverepairCardDetails(cardApplyDto.getId(), cardApplyDto.getRepairCardRecords()); //添加到文件库和minio上 if (StringUtils.isNotNull(fileBasicMsgDto.getFiles())) { diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/BmWorkerContractMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/BmWorkerContractMapper.xml index 602b273..197a0eb 100644 --- a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/BmWorkerContractMapper.xml +++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/BmWorkerContractMapper.xml @@ -26,6 +26,9 @@ + + + @@ -205,4 +208,33 @@ + + + + + INSERT INTO pm_to_do ( + `type`, `data_key`, `status`, `sub_com_id`, `org_id`, + `pro_id`, `worker_id`, `content`, `update_user` + ) VALUES ( + #{type}, #{dataKey}, #{status}, #{subComId}, #{orgId}, + #{proId}, #{workerId}, #{content}, #{updateUser} + ) + diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmToDoMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmToDoMapper.xml new file mode 100644 index 0000000..4bf1afb --- /dev/null +++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmToDoMapper.xml @@ -0,0 +1,127 @@ + + + + + + + + + + + + + + + + + + + + + + + update pm_to_do + set + status = 1 + where id in + + #{item} + + + diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmWorkerMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmWorkerMapper.xml index b0630ee..d1c7d99 100644 --- a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmWorkerMapper.xml +++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmWorkerMapper.xml @@ -25,6 +25,9 @@ + + + + SELECT + pw.id, + pw.`name`, + bwem.pro_id, + bwem.pro_name, + bwem.team_name, + bwem.sub_name, + bwem.post_name, + bwem.ein_time, + IF(bf1.id IS NOT NULL, 1, 0) AS faceFile, + IF(bf2.id IS NOT NULL, 1, 0) AS contractFile, + IF(bf3.id IS NOT NULL, 1, 0) AS wageFile + FROM + bm_worker_ein_msg bwem + INNER JOIN pm_worker pw ON pw.id = bwem.worker_id + AND pw.is_active = 1 + LEFT JOIN bm_files bf1 ON bf1.source_id = pw.id + AND bf1.source_table = 'pm_worker' + AND bf1.file_url IS NOT NULL + LEFT JOIN bm_worker_contract bwc ON bwc.worker_id = bwem.worker_id + AND bwc.pro_id = bwem.pro_id + LEFT JOIN bm_files bf2 ON bf2.source_id = bwc.id + AND bf2.source_table = 'bm_worker_contract' + AND bf2.file_url IS NOT NULL + LEFT JOIN bm_worker_wage_card bwwc ON bwwc.worker_id = bwem.worker_id + LEFT JOIN bm_files bf3 ON bf3.source_id = bwwc.id + AND bf3.source_table = 'bm_worker_wage_card' + AND bf3.file_url IS NOT NULL + where bwem.pro_id = #{proId} + + and locate(#{subName}, bwem.sub_name) > 0 + + + and locate(#{teamName}, bwem.team_name) > 0 + + + and pw.name like concat('%',#{name},'%') + + GROUP BY + pw.id,bwem.pro_id + order by contractFile ASC + + diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/RepairCardApplyMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/RepairCardApplyMapper.xml index 0943f61..b62ce89 100644 --- a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/RepairCardApplyMapper.xml +++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/RepairCardApplyMapper.xml @@ -197,9 +197,9 @@ brca.repair_num as repairNum, brca.repair_day as repairDay, brca.repair_remark as repairRemark, - brca.apply_user as applyUser, + su.nick_name as applyUser, brca.apply_time as applyTime, - brca.check_user as checkUser, + su2.nick_name as checkUser, brca.check_status as checkStatus, case when brca.check_status = 0 then '待审核' when brca.check_status = 1 then '审核通过' @@ -208,7 +208,9 @@ brca.check_time as checkTime, brca.refuse_remark as refuseRemark from bm_repair_card_apply brca - left join pm_project pp on pp.id = brca.pro_id + left join pm_project pp on pp.id = brca.pro_id + left join sys_user su on su.user_name = brca.apply_user + left join sys_user su2 on su2.user_name = brca.check_user and brca.apply_user like concat('%',#{applyUser},'%') @@ -360,4 +362,16 @@ table_month = #{repairMonth} AND pro_id = #{proId} + +