考核管理调整

src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEnterpriseScoreController.java

@@ -9,6 +9,8 @@ import com.zhgd.jeecg.common.api.vo.Result;
 import com.zhgd.jeecg.common.system.query.QueryGenerator;
 import com.zhgd.xmgl.modules.safety.dto.EnterpriseScoreDto;
 import com.zhgd.xmgl.modules.safety.entity.EnterpriseScore;
+import com.zhgd.xmgl.modules.safety.entity.EnterpriseScoreDetail;
+import com.zhgd.xmgl.modules.safety.service.IEnterpriseScoreDetailService;
 import com.zhgd.xmgl.modules.safety.service.IEnterpriseScoreService;
 import com.zhgd.xmgl.modules.safety.vo.EnterpriseScoreVo;
 import com.zhgd.xmgl.security.SecurityUtil;
@@ -47,6 +49,9 @@ public class GovEnterpriseScoreController {
     @Autowired
     private IEnterpriseScoreService enterpriseScoreService;
 
+    @Autowired
+    private IEnterpriseScoreDetailService enterpriseScoreDetailService;
+
     /**
      * 分页列表查询
      *
@@ -55,8 +60,9 @@ public class GovEnterpriseScoreController {
     @OperLog(operModul = "企业对应工程得分管理", operType = "分页查询", operDesc = "分页列表查询企业对应工程得分信息")
     @ApiOperation(value = " 分页列表查询企业对应工程得分信息", notes = "分页列表查询企业对应工程得分信息", httpMethod = "POST")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "enterpriseType", value = "企业类型", paramType = "body", required = true, dataType = "Integer"),
+            @ApiImplicitParam(name = "enterpriseType", value = "企业类型", paramType = "body", dataType = "String"),
-            @ApiImplicitParam(name = "enterpriseName", value = "企业名称", paramType = "body", required = true, defaultValue = "10", dataType = "Integer"),
+            @ApiImplicitParam(name = "enterpriseName", value = "企业名称", paramType = "body", dataType = "String"),
+            @ApiImplicitParam(name = "scoreFlag", value = "是否评分(0:未评分;1:已评分)", paramType = "body", dataType = "String"),
             @ApiImplicitParam(name = "pageNo", value = "页数", paramType = "body", required = true, defaultValue = "1", dataType = "Integer"),
             @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "body", required = true, defaultValue = "10", dataType = "Integer")
     })
@@ -180,7 +186,7 @@ public class GovEnterpriseScoreController {
         if (enterpriseScoreEntity == null) {
             result.error500("未找到对应实体");
         } else {
-            boolean ok = enterpriseScoreService.updateById(enterpriseScore);
+            boolean ok = enterpriseScoreService.updateInfo(enterpriseScore);
             if (ok) {
                 result.success("修改成功!");
             } else {
@@ -207,6 +213,8 @@ public class GovEnterpriseScoreController {
             result.error500("未找到对应实体");
         } else {
             boolean ok = enterpriseScoreService.removeById(enterpriseScore.getId());
+            enterpriseScoreDetailService.remove(Wrappers.<EnterpriseScoreDetail>lambdaQuery()
+                    .in(EnterpriseScoreDetail::getScoreId, enterpriseScore.getId()));
             if (ok) {
                 result.success("删除成功!");
             } else {
@@ -231,7 +239,9 @@ public class GovEnterpriseScoreController {
         if (ids == null || "".equals(ids.trim())) {
             result.error500("参数不识别！");
         } else {
-            this.enterpriseScoreService.removeByIds(Arrays.asList(ids.split(",")));
+            enterpriseScoreService.removeByIds(Arrays.asList(ids.split(",")));
+            enterpriseScoreDetailService.remove(Wrappers.<EnterpriseScoreDetail>lambdaQuery()
+                    .in(EnterpriseScoreDetail::getScoreId, Arrays.asList(ids.split(","))));
             result.success("删除成功!");
         }
         return result;

src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEnterpriseScoreDetailController.java

@@ -1,14 +1,19 @@
 package com.zhgd.xmgl.modules.basicdata.controller.government;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zhgd.annotation.OperLog;
 import com.zhgd.jeecg.common.api.vo.Result;
 import com.zhgd.jeecg.common.system.query.QueryGenerator;
 import com.zhgd.jeecg.common.util.PageUtil;
+import com.zhgd.xmgl.modules.safety.entity.EnterpriseScore;
 import com.zhgd.xmgl.modules.safety.entity.EnterpriseScoreDetail;
 import com.zhgd.xmgl.modules.safety.service.IEnterpriseScoreDetailService;
+import com.zhgd.xmgl.modules.safety.service.IEnterpriseScoreService;
+import com.zhgd.xmgl.modules.safety.vo.EnterpriseScoreDetailVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -41,9 +46,13 @@ import java.util.stream.Collectors;
 @Slf4j
 @Api(tags = "企业对应工程得分明细管理")
 public class GovEnterpriseScoreDetailController {
+
     @Autowired
     private IEnterpriseScoreDetailService enterpriseScoreDetailService;
 
+    @Autowired
+    private IEnterpriseScoreService enterpriseScoreService;
+
     /**
      * 分页列表查询
      *
@@ -91,12 +100,25 @@ public class GovEnterpriseScoreDetailController {
     @ApiImplicitParam(name = "scoreId", value = "企业评分ID", paramType = "body", required = true, dataType = "String")
     @PostMapping(value = "/listByItem")
     public Result<Map<String, Object>> listByItem(@RequestBody EnterpriseScoreDetail enterpriseScoreDetail) {
+//        LambdaQueryWrapper<EnterpriseScoreDetail> wrapper = Wrappers.<EnterpriseScoreDetail>lambdaQuery();
+//        if (enterpriseScoreDetail.getScoreId() != null) {
+//            wrapper.eq(EnterpriseScoreDetail::getScoreId, enterpriseScoreDetail.getScoreId());
+//        }
+//        if (StringUtils.isNotBlank(enterpriseScoreDetail.getSubItem())) {
+//            wrapper.eq(EnterpriseScoreDetail::getSubItem, enterpriseScoreDetail.getSubItem());
+//        }
+//        return Result.success(enterpriseScoreDetailService.list(wrapper));
         List<String> item = enterpriseScoreDetailService.getItem(enterpriseScoreDetail.getScoreId());
         QueryWrapper<EnterpriseScoreDetail> queryWrapper = QueryGenerator.initQueryWrapper(enterpriseScoreDetail);
         List<EnterpriseScoreDetail> list = enterpriseScoreDetailService.list(queryWrapper);
         Map<String, Object> resultMap = new HashMap<>();
         for (String im : item) {
-            resultMap.put(im, list.stream().filter(l -> l.getSubItem().equals(im)).collect(Collectors.toList()));
+            Map<String, Object> categoryMap = new HashMap<>();
+            List<String> category = list.stream().filter(l -> l.getSubItem().equals(im)).map(EnterpriseScoreDetail::getCategory).collect(Collectors.toList());
+            for (String s : category) {
+                categoryMap.put(s, list.stream().filter(l -> l.getSubItem().equals(im) && l.getCategory().equals(s)).collect(Collectors.toList()));
+            }
+            resultMap.put(im, categoryMap);
         }
         return Result.success(resultMap);
     }
@@ -105,29 +127,29 @@ public class GovEnterpriseScoreDetailController {
     /**
      * 添加
      *
-     * @param enterpriseScoreDetails
+     * @param enterpriseScoreDetailVo
      * @return
      */
     @OperLog(operModul = "企业对应工程得分明细管理", operType = "新增", operDesc = "添加企业对应工程得分明细信息")
     @ApiOperation(value = " 添加企业对应工程得分明细信息", notes = "添加企业对应工程得分明细信息", httpMethod = "POST")
     @PostMapping(value = "/add")
-    public Result<Object> add(@RequestBody List<EnterpriseScoreDetail> enterpriseScoreDetails) {
+    public Result<Object> add(@RequestBody EnterpriseScoreDetailVo enterpriseScoreDetailVo) {
-        enterpriseScoreDetailService.saveInfo(enterpriseScoreDetails);
+        enterpriseScoreDetailService.saveOrUpdateInfo(enterpriseScoreDetailVo);
         return Result.success("添加成功！");
     }
 
     /**
      * 编辑
      *
-     * @param enterpriseScoreDetails
+     * @param enterpriseScoreDetailVo
      * @return
      */
     @OperLog(operModul = "企业对应工程得分明细管理", operType = "修改", operDesc = "编辑企业对应工程得分明细信息")
     @ApiOperation(value = "编辑企业对应工程得分明细信息", notes = "编辑企业对应工程得分明细信息", httpMethod = "POST")
     @PostMapping(value = "/edit")
-    public Result<EnterpriseScoreDetail> edit(@RequestBody List<EnterpriseScoreDetail> enterpriseScoreDetails) {
+    public Result<EnterpriseScoreDetail> edit(@RequestBody EnterpriseScoreDetailVo enterpriseScoreDetailVo) {
         Result<EnterpriseScoreDetail> result = new Result<EnterpriseScoreDetail>();
-        boolean ok = enterpriseScoreDetailService.updateInfo(enterpriseScoreDetails);
+        boolean ok = enterpriseScoreDetailService.saveOrUpdateInfo(enterpriseScoreDetailVo);
         if (ok) {
             result.success("修改成功!");
         } else {
@@ -174,7 +196,15 @@ public class GovEnterpriseScoreDetailController {
         if (ids == null || "".equals(ids.trim())) {
             result.error500("参数不识别！");
         } else {
-            this.enterpriseScoreDetailService.removeByIds(Arrays.asList(ids.split(",")));
+            enterpriseScoreDetailService.remove(Wrappers.<EnterpriseScoreDetail>lambdaQuery().in(EnterpriseScoreDetail::getScoreId, Arrays.asList(ids.split(","))));
+            LambdaUpdateWrapper<EnterpriseScore> wrapper = Wrappers.<EnterpriseScore>lambdaUpdate();
+            wrapper.set(EnterpriseScore::getScore, null);
+            wrapper.set(EnterpriseScore::getScoreTime, null);
+            wrapper.set(EnterpriseScore::getStartTime, null);
+            wrapper.set(EnterpriseScore::getEndTime, null);
+            wrapper.set(EnterpriseScore::getConcatNumber, null);
+            wrapper.in(EnterpriseScore::getId, Arrays.asList(ids.split(",")));
+            enterpriseScoreService.update(wrapper);
             result.success("删除成功!");
         }
         return result;

src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEnterpriseScoreStandardController.java

@@ -86,17 +86,34 @@ public class GovEnterpriseScoreStandardController {
      */
     @OperLog(operModul = "企业类型评分标准管理", operType = "列表查询", operDesc = "列表查询企业类型评分标准信息(按分项)")
     @ApiOperation(value = " 列表查询企业类型评分标准信息(按分项)", notes = "列表查询企业类型评分标准信息(按分项)", httpMethod = "POST")
-    @ApiImplicitParam(name = "enterpriseType", value = "企业类型", paramType = "body", dataType = "Integer")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "enterpriseType", value = "企业类型", paramType = "body", dataType = "Integer"),
+            @ApiImplicitParam(name = "subItem", value = "分项", paramType = "body", dataType = "String")
+    })
     @PostMapping(value = "/listByItem")
     public Result<Map<String, Object>> listByItem(@RequestBody EnterpriseScoreStandard enterpriseScoreStandard) {
+//        LambdaQueryWrapper<EnterpriseScoreStandard> wrapper = Wrappers.<EnterpriseScoreStandard>lambdaQuery();
+//        if (enterpriseScoreStandard.getEnterpriseType() != null) {
+//            wrapper.eq(EnterpriseScoreStandard::getEnterpriseType, enterpriseScoreStandard.getEnterpriseType());
+//        }
+//        if (StringUtils.isNotBlank(enterpriseScoreStandard.getSubItem())) {
+//            wrapper.eq(EnterpriseScoreStandard::getSubItem, enterpriseScoreStandard.getSubItem());
+//        }
+//        return Result.success(enterpriseScoreStandardService.list(wrapper));
         List<String> item = enterpriseScoreStandardService.getItem(enterpriseScoreStandard.getEnterpriseType());
         QueryWrapper<EnterpriseScoreStandard> queryWrapper = QueryGenerator.initQueryWrapper(enterpriseScoreStandard);
         List<EnterpriseScoreStandard> list = enterpriseScoreStandardService.list(queryWrapper);
         Map<String, Object> resultMap = new HashMap<>();
         for (String im : item) {
-            resultMap.put(im, list.stream().filter(l -> l.getSubItem().equals(im)).collect(Collectors.toList()));
+            Map<String, Object> categoryMap = new HashMap<>();
+            List<String> category = list.stream().filter(l -> l.getSubItem().equals(im)).map(EnterpriseScoreStandard::getCategory).collect(Collectors.toList());
+            for (String s : category) {
+                categoryMap.put(s, list.stream().filter(l -> l.getSubItem().equals(im) && l.getCategory().equals(s)).collect(Collectors.toList()));
+            }
+            resultMap.put(im, categoryMap);
         }
         return Result.success(resultMap);
+
     }
 
 
@@ -225,4 +242,17 @@ public class GovEnterpriseScoreStandardController {
         QueryWrapper<EnterpriseScoreStandard> queryWrapper = QueryGenerator.initQueryWrapper(enterpriseScoreStandard);
         return Result.success(enterpriseScoreStandardService.score(queryWrapper));
     }
+
+    /**
+     * 根据企业类型获取分项列表
+     * @param enterpriseScoreStandard
+     * @return
+     */
+    @OperLog(operModul = "企业类型评分标准管理", operType = "列表查询", operDesc = "根据企业类型获取分项列表")
+    @ApiOperation(value = " 根据企业类型获取分项列表", notes = "根据企业类型获取分项列表", httpMethod = "POST")
+    @ApiImplicitParam(name = "enterpriseType", value = "企业类型", paramType = "body", required = true, dataType = "Integer")
+    @PostMapping(value = "/subItemList")
+    public Result<List<String>> subItemList(@ApiIgnore @RequestBody EnterpriseScoreStandard enterpriseScoreStandard) {
+        return Result.success(enterpriseScoreStandardService.getItem(enterpriseScoreStandard.getEnterpriseType()));
+    }
 }

src/main/java/com/zhgd/xmgl/modules/safety/entity/EnterpriseScore.java

@@ -78,6 +78,30 @@ public class EnterpriseScore implements Serializable {
     @Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "创建时间")
     private Date createTime;
+    /**
+     * 填表时间
+     */
+    @Excel(name = "填表时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "填表时间")
+    private Date scoreTime;
+    /**
+     * 合同编号
+     */
+    @Excel(name = "合同编号", width = 15)
+    @ApiModelProperty(value = "合同编号")
+    private String concatNumber;
+    /**
+     * 考核开始时间
+     */
+    @Excel(name = "考核开始时间", width = 20, format = "yyyy-MM")
+    @ApiModelProperty(value = "考核开始时间")
+    private String startTime;
+    /**
+     * 考核结束时间
+     */
+    @Excel(name = "考核结束时间", width = 20, format = "yyyy-MM")
+    @ApiModelProperty(value = "考核结束时间")
+    private String endTime;
 
     @TableField(exist = false)
     @ApiModelProperty(value = "企业类型名称")

src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/EnterpriseScoreMapper.xml

@@ -17,6 +17,10 @@
             s.engineering_state,
             s.create_by,
             s.enterprise_type,
+            s.score_time,
+            s.concat_number,
+            s.start_time,
+            s.end_time,
             CONCAT(IFNULL( s.engineering_name, "" ),
                     IFNULL( e.engineering_name, "" )) engineering_name
         FROM

src/main/java/com/zhgd/xmgl/modules/safety/service/IEnterpriseScoreDetailService.java

@@ -3,6 +3,7 @@ package com.zhgd.xmgl.modules.safety.service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.zhgd.xmgl.modules.safety.entity.EnterpriseScoreDetail;
+import com.zhgd.xmgl.modules.safety.vo.EnterpriseScoreDetailVo;
 
 import java.util.List;
 import java.util.Map;
@@ -20,9 +21,9 @@ public interface IEnterpriseScoreDetailService extends IService<EnterpriseScoreD
 
     List<EnterpriseScoreDetail> pageList(EnterpriseScoreDetail enterpriseScoreDetail);
 
-    boolean saveInfo(List<EnterpriseScoreDetail> enterpriseScoreDetails);
+    boolean saveOrUpdateInfo(EnterpriseScoreDetailVo enterpriseScoreDetailVo);
 
-    boolean updateInfo(List<EnterpriseScoreDetail> enterpriseScoreDetails);
+    boolean updateInfo(EnterpriseScoreDetailVo enterpriseScoreDetailVo);
 
     List<String> getItem(Long scoreId);
 }

src/main/java/com/zhgd/xmgl/modules/safety/service/IEnterpriseScoreService.java

@@ -23,6 +23,8 @@ public interface IEnterpriseScoreService extends IService<EnterpriseScore> {
 
     boolean saveInfo(EnterpriseScore enterpriseScore);
 
+    boolean updateInfo(EnterpriseScore enterpriseScore);
+
     Integer enterpriseNum(Wrapper<EnterpriseScore> queryWrapper);
 
     boolean delInfo(Integer enterpriseType);

src/main/java/com/zhgd/xmgl/modules/safety/service/impl/EnterpriseScoreDetailServiceImpl.java

@@ -12,6 +12,7 @@ import com.zhgd.xmgl.modules.safety.entity.EnterpriseScoreStandard;
 import com.zhgd.xmgl.modules.safety.mapper.EnterpriseScoreDetailMapper;
 import com.zhgd.xmgl.modules.safety.service.IEnterpriseScoreDetailService;
 import com.zhgd.xmgl.modules.safety.service.IEnterpriseScoreService;
+import com.zhgd.xmgl.modules.safety.vo.EnterpriseScoreDetailVo;
 import org.apache.commons.collections.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -50,15 +51,20 @@ public class EnterpriseScoreDetailServiceImpl extends ServiceImpl<EnterpriseScor
     }
 
     @Override
-    public boolean saveInfo(List<EnterpriseScoreDetail> enterpriseScoreDetails) {
+    public boolean saveOrUpdateInfo(EnterpriseScoreDetailVo enterpriseScoreDetailVo) {
+        List<EnterpriseScoreDetail> enterpriseScoreDetails = enterpriseScoreDetailVo.getEnterpriseScoreDetails();
         for (EnterpriseScoreDetail enterpriseScoreDetail : enterpriseScoreDetails) {
-            enterpriseScoreDetail.setScore(enterpriseScoreDetail.getStandardScore() - enterpriseScoreDetail.getDeductPoints());
+            enterpriseScoreDetail.setDeductPoints(enterpriseScoreDetail.getStandardScore() - enterpriseScoreDetail.getScore());
         }
-        boolean flag = this.saveBatch(enterpriseScoreDetails);
+        boolean flag = this.saveOrUpdateBatch(enterpriseScoreDetails);
         if (flag) {
             Integer totalScore = enterpriseScoreDetails.stream().map(e -> e.getScore()).reduce(Integer::sum).orElse(0);
             LambdaUpdateWrapper<EnterpriseScore> wrapper = Wrappers.<EnterpriseScore>lambdaUpdate();
             wrapper.set(EnterpriseScore::getScore, totalScore);
+            wrapper.set(EnterpriseScore::getConcatNumber, enterpriseScoreDetailVo.getConcatNumber());
+            wrapper.set(EnterpriseScore::getScoreTime, enterpriseScoreDetailVo.getScoreTime());
+            wrapper.set(EnterpriseScore::getStartTime, enterpriseScoreDetailVo.getStartTime());
+            wrapper.set(EnterpriseScore::getEndTime, enterpriseScoreDetailVo.getEndTime());
             wrapper.eq(EnterpriseScore::getId, enterpriseScoreDetails.get(0).getScoreId());
             enterpriseScoreService.update(wrapper);
         }
@@ -66,7 +72,8 @@ public class EnterpriseScoreDetailServiceImpl extends ServiceImpl<EnterpriseScor
     }
 
     @Override
-    public boolean updateInfo(List<EnterpriseScoreDetail> enterpriseScoreDetails) {
+    public boolean updateInfo(EnterpriseScoreDetailVo enterpriseScoreDetailVo) {
+        List<EnterpriseScoreDetail> enterpriseScoreDetails = enterpriseScoreDetailVo.getEnterpriseScoreDetails();
         for (EnterpriseScoreDetail enterpriseScoreDetail : enterpriseScoreDetails) {
             enterpriseScoreDetail.setScore(enterpriseScoreDetail.getStandardScore() - enterpriseScoreDetail.getDeductPoints());
         }

src/main/java/com/zhgd/xmgl/modules/safety/service/impl/EnterpriseScoreServiceImpl.java

@@ -2,6 +2,7 @@ package com.zhgd.xmgl.modules.safety.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -52,6 +53,7 @@ public class EnterpriseScoreServiceImpl extends ServiceImpl<EnterpriseScoreMappe
     public Page<EnterpriseScoreDto> pageList(Map<String, Object> map) {
         Integer enterpriseType = MapUtils.getInteger(map, "enterpriseType");
         String enterpriseName = MapUtils.getString(map, "enterpriseName");
+        Integer scoreFlag = MapUtils.getInteger(map, "scoreFlag");
         LambdaQueryWrapper<EnterpriseScore> wrapper = Wrappers.<EnterpriseScore>lambdaQuery();
         if (enterpriseType != null) {
             wrapper.eq(EnterpriseScore::getEnterpriseType, enterpriseType);
@@ -59,8 +61,19 @@ public class EnterpriseScoreServiceImpl extends ServiceImpl<EnterpriseScoreMappe
         if (StringUtils.isNotBlank(enterpriseName)) {
             wrapper.like(EnterpriseScore::getEngineeringName, enterpriseName);
         }
+        if (scoreFlag != null && scoreFlag == 1) {
+            wrapper.isNotNull(EnterpriseScore::getScore);
+        }
+        if (scoreFlag != null && scoreFlag == 0) {
+            wrapper.isNull(EnterpriseScore::getScore);
+        }
         Page<EnterpriseScore> page = PageUtil.getPage(map);
-        return baseMapper.pageList(page, wrapper);
+        Page<EnterpriseScoreDto> pageList = baseMapper.pageList(page, wrapper);
+        List<SystemDictData> systemDictData = systemDictDataService.getByType(ParamEnum.SysDictType.ENTERPRISE_MAIN.getValue());
+        for (EnterpriseScoreDto enterpriseScoreDto : pageList.getRecords()) {
+            enterpriseScoreDto.setEnterpriseTypeName(CommonUtil.getDictValue(systemDictData, enterpriseScoreDto.getEnterpriseType()));
+        }
+        return pageList;
     }
 
     @Override
@@ -81,8 +94,9 @@ public class EnterpriseScoreServiceImpl extends ServiceImpl<EnterpriseScoreMappe
         if (one != null) {
             throw new CustomException("已存在绑定关系");
         }
-        if (StringUtils.isNotBlank(enterpriseScore.getEnterpriseSn())) {
+        if (StringUtils.isNotBlank(enterpriseScore.getEngineeringSn())) {
             EngineeringMain engineeringMain = new EngineeringMain();
+            engineeringMain.setEngineeringSn(enterpriseScore.getEngineeringSn());
             engineeringMain.setEnterpriseSn(enterpriseScore.getEnterpriseSn());
             engineeringMain.setType(enterpriseScore.getEnterpriseType());
             engineeringMainService.save(engineeringMain);
@@ -90,6 +104,44 @@ public class EnterpriseScoreServiceImpl extends ServiceImpl<EnterpriseScoreMappe
         return this.save(enterpriseScore);
     }
 
+    @Override
+    public boolean updateInfo(EnterpriseScore enterpriseScore) {
+        // 新增工程主体信息
+        EngineeringMain check = engineeringMainService.getOne(Wrappers.<EngineeringMain>lambdaQuery().eq(EngineeringMain::getEngineeringSn, enterpriseScore.getEngineeringSn())
+                .eq(EngineeringMain::getEnterpriseSn, enterpriseScore.getEnterpriseSn()).eq(EngineeringMain::getType, enterpriseScore.getEnterpriseType()));
+        if (check != null) {
+            throw new CustomException("已存在绑定关系");
+        }
+        LambdaUpdateWrapper<EnterpriseScore> wrapper = Wrappers.<EnterpriseScore>lambdaUpdate();
+        EnterpriseScore byId = this.getById(enterpriseScore.getId());
+        if (StringUtils.isNotBlank(byId.getEngineeringSn())) {
+            EngineeringMain one = engineeringMainService.getOne(Wrappers.<EngineeringMain>lambdaQuery().eq(EngineeringMain::getEngineeringSn, byId.getEngineeringSn())
+                    .eq(EngineeringMain::getEnterpriseSn, byId.getEnterpriseSn()).eq(EngineeringMain::getType, byId.getEnterpriseType()));
+            if (StringUtils.isNotBlank(enterpriseScore.getEngineeringSn())) {
+                one.setEnterpriseSn(enterpriseScore.getEnterpriseSn());
+                one.setEngineeringSn(enterpriseScore.getEngineeringSn());
+                engineeringMainService.updateById(one);
+                wrapper.set(EnterpriseScore::getEngineeringSn, enterpriseScore.getEngineeringSn());
+            } else {
+                engineeringMainService.removeById(one);
+                wrapper.set(EnterpriseScore::getEngineeringSn, null);
+            }
+        } else {
+            if (StringUtils.isNotBlank(enterpriseScore.getEngineeringSn())) {
+                EngineeringMain engineeringMain = new EngineeringMain();
+                engineeringMain.setEngineeringSn(enterpriseScore.getEngineeringSn());
+                engineeringMain.setEnterpriseSn(enterpriseScore.getEnterpriseSn());
+                engineeringMain.setType(enterpriseScore.getEnterpriseType());
+                engineeringMainService.save(engineeringMain);
+                wrapper.set(EnterpriseScore::getEngineeringSn, enterpriseScore.getEngineeringSn());
+            }
+        }
+        wrapper.set(EnterpriseScore::getEnterpriseSn, enterpriseScore.getEnterpriseSn());
+        wrapper.set(EnterpriseScore::getEngineeringName, enterpriseScore.getEngineeringName());
+        wrapper.eq(EnterpriseScore::getId, enterpriseScore.getId());
+        return this.update(wrapper);
+    }
+
     @Override
     public Integer enterpriseNum(Wrapper<EnterpriseScore> queryWrapper) {
         return baseMapper.enterpriseNum(queryWrapper);
@@ -99,10 +151,11 @@ public class EnterpriseScoreServiceImpl extends ServiceImpl<EnterpriseScoreMappe
     public boolean delInfo(Integer enterpriseType) {
         List<EnterpriseScore> enterpriseScores = baseMapper.selectList(Wrappers.<EnterpriseScore>lambdaQuery().eq(EnterpriseScore::getEnterpriseType, enterpriseType));
         if (enterpriseScores.size() > 0) {
-            List<EnterpriseScoreDetail> enterpriseScoreDetails = enterpriseScoreDetailService.list(Wrappers.<EnterpriseScoreDetail>lambdaQuery()
+            enterpriseScoreDetailService.remove(Wrappers.<EnterpriseScoreDetail>lambdaQuery()
                     .in(EnterpriseScoreDetail::getScoreId, enterpriseScores.stream().map(e -> e.getId()).collect(Collectors.toList())));
-            enterpriseScoreDetailService.removeByIds(enterpriseScoreDetails);
+            engineeringMainService.remove(Wrappers.<EngineeringMain>lambdaQuery().eq(EngineeringMain::getType, enterpriseType));
-        }
             return this.removeByIds(enterpriseScores);
         }
+        return true;
+    }
 }

src/main/java/com/zhgd/xmgl/modules/safety/service/impl/UnmannedVideoServiceImpl.java

@@ -71,10 +71,10 @@ public class UnmannedVideoServiceImpl extends ServiceImpl<UnmannedVideoMapper, U
             wrapper.eq(UnmannedVideo::getEngineeringSn, unmannedVideo.getEngineeringSn());
         }
         if (StringUtils.isNotBlank(unmannedVideo.getStartTime())) {
-            wrapper.le(UnmannedVideo::getUploadTime, DateUtils.start(unmannedVideo.getStartTime()));
+            wrapper.ge(UnmannedVideo::getUploadTime, DateUtils.start(unmannedVideo.getStartTime()));
         }
         if (StringUtils.isNotBlank(unmannedVideo.getEndTime())) {
-            wrapper.ge(UnmannedVideo::getUploadTime, DateUtils.end(unmannedVideo.getEndTime()));
+            wrapper.le(UnmannedVideo::getUploadTime, DateUtils.end(unmannedVideo.getEndTime()));
         }
         return this.page(page, wrapper);
     }

src/main/java/com/zhgd/xmgl/modules/safety/vo/EnterpriseScoreDetailVo.java

@@ -0,0 +1,28 @@
+package com.zhgd.xmgl.modules.safety.vo;
+
+import com.zhgd.xmgl.modules.safety.entity.EnterpriseScoreDetail;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@ApiModel(value = "保存企业得分参数(VO)", description = "EnterpriseScoreDetailVo")
+public class EnterpriseScoreDetailVo {
+
+    @ApiModelProperty(value = "填表时间")
+    private String scoreTime;
+
+    @ApiModelProperty(value = "合同编号")
+    private String concatNumber;
+
+    @ApiModelProperty(value = "考核开始时间")
+    private String startTime;
+
+    @ApiModelProperty(value = "考核结束时间")
+    private String endTime;
+
+    @ApiModelProperty(value = "评分详细")
+    private List<EnterpriseScoreDetail> enterpriseScoreDetails;
+}