包头bug修改

src/main/java/com/zhgd/xmgl/modules/baotou/controller/MainProjectCompleteDetailController.java

@@ -118,6 +118,15 @@ public class MainProjectCompleteDetailController {
         return Result.ok();
     }
 
+    @OperLog(operModul = "主要工程量完成情况详情表管理", operType = "删除", operDesc = "删除主要工程量完成情况详情表信息")
+    @ApiOperation(value = "删除主要工程量完成情况详情表信息", notes = "删除主要工程量完成情况详情表信息", httpMethod = "POST")
+    @ApiImplicitParam(name = "nameId", value = "主要工程量完成情况名称id", paramType = "body", required = true, dataType = "String")
+    @PostMapping(value = "/deleteByNameId")
+    public Result deleteByNameId(@ApiIgnore @RequestBody HashMap<String, Object> map) {
+        mainProjectCompleteDetailService.deleteByNameId(MapUtils.getString(map, "nameId"));
+        return Result.ok();
+    }
+
     /**
      * 通过id查询
      *

src/main/java/com/zhgd/xmgl/modules/baotou/service/IMainProjectCompleteDetailService.java

@@ -64,4 +64,6 @@ public interface IMainProjectCompleteDetailService extends IService<MainProjectC
     void addFromFlow(Map<String, Object> map);
 
     void projectOverviewExportXls(HttpServletRequest request, HttpServletResponse response, HashMap<String, Object> param);
+
+    void deleteByNameId(String id);
 }

src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/MainProjectCompleteDetailServiceImpl.java

@@ -26,6 +26,7 @@ import org.apache.commons.collections.MapUtils;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.ss.util.CellRangeAddress;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -57,6 +58,9 @@ public class MainProjectCompleteDetailServiceImpl extends ServiceImpl<MainProjec
     private IMainProjectCompletePeriodService mainProjectCompletePeriodService;
     @Autowired
     private IDeviceUnitService deviceUnitService;
+    @Lazy
+    @Autowired
+    private IMainProjectCompleteDetailService mainProjectCompleteDetailService;
 
     @Override
     public IPage<MainProjectCompleteDetailVo> queryPageList(HashMap<String, Object> param) {
@@ -591,6 +595,15 @@ public class MainProjectCompleteDetailServiceImpl extends ServiceImpl<MainProjec
         }
     }
 
+    @Override
+    public void deleteByNameId(String id) {
+        mainProjectCompleteNameService.delete(id);
+        mainProjectCompleteDetailService.remove(new LambdaQueryWrapper<MainProjectCompleteDetail>()
+                .eq(MainProjectCompleteDetail::getMainProjectCompleteNameId, id));
+        mainProjectCompleteTotalService.remove(new LambdaQueryWrapper<MainProjectCompleteTotal>()
+                .eq(MainProjectCompleteTotal::getMainProjectCompleteNameId, id));
+    }
+
     private void styleCustom(Workbook workbook) {
         CellStyle style = workbook.createCellStyle();
         style.setAlignment(HorizontalAlignment.CENTER);

src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/MainProjectCompleteNameServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zhgd.xmgl.modules.baotou.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -121,6 +122,10 @@ public class MainProjectCompleteNameServiceImpl extends ServiceImpl<MainProjectC
         if (mainProjectCompleteName == null) {
             throw new OpenAlertException("未找到对应实体");
         }
+        List<MainProjectCompleteName> children = baseMapper.getChildren(Long.valueOf(id));
+        if (CollUtil.isNotEmpty(children)) {
+            throw new OpenAlertException("请先删除下级");
+        }
         baseMapper.deleteById(id);
     }
 

src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/WorkerAdmissionServiceImpl.java

@@ -294,6 +294,10 @@ public class WorkerAdmissionServiceImpl extends ServiceImpl<WorkerAdmissionMappe
             workerAdmissionCertificateDetailService.saveBatch(certificateDetails);
         }
         noticeService.addProjectLevelNotice(projectSn, "人员入场审批", msg, "10", null);
+        if (CollUtil.isNotEmpty(failStrs)) {
+            String m = "资质不合格人员：" + StrUtil.join("、", failStrs);
+            noticeService.addUserNotice(admission.getCertificateIssuingPerson(), "人员入场审批资质不合格通知", m, "10", null);
+        }
     }
 
     @Override

src/main/java/com/zhgd/xmgl/modules/exam/service/impl/ExamTrainRecordServiceImpl.java

@@ -155,7 +155,7 @@ public class ExamTrainRecordServiceImpl extends ServiceImpl<ExamTrainRecordMappe
                     List<Long> certificateIssuingPersons = workerAdmissionService.list(new LambdaQueryWrapper<WorkerAdmission>()
                             .in(WorkerAdmission::getId, admissionIds)).stream().map(WorkerAdmission::getCertificateIssuingPerson).distinct().collect(Collectors.toList());
                     noticeService.addUsersNotice(certificateIssuingPersons, "入场培训不合格通知",
-                            StrUtil.format("{}(身份证号：{})参加考试科目为{}试题名称为{}的入场培训不合格",
+                            StrUtil.format("{}(身份证号：{})，参加考试科目为{}，试题名称为{}，入场培训不合格",
                                     r.getWorkerName(), r.getWorkerCard(), subject.getName(), examPaper.getName()), "10");
                 }
             }
@@ -333,7 +333,7 @@ public class ExamTrainRecordServiceImpl extends ServiceImpl<ExamTrainRecordMappe
             trainRecord.setEntryTime(entryTime);
 //                trainRecord.setScore(0);
 //                trainRecord.setTotalScore(0);
-            trainRecord.setExamCount(0);
+            trainRecord.setExamCount(1);
 //                trainRecord.setExamNum(0);
 //                trainRecord.setIsSignIn(0);
             trainRecord.setIsPass(0);