bug修复

src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerCertificateController.java

@@ -68,27 +68,11 @@ public class WorkerCertificateController {
     @PostMapping(value = "/add")
     public Result<WorkerCertificate> add(@RequestBody WorkerCertificate workerCertificate) {
         Result<WorkerCertificate> result = new Result<WorkerCertificate>();
-        try {
+        workerCertificateService.add(workerCertificate);
-            checkParam(workerCertificate);
+        result.successMsg(MessageUtil.get("addSucess"));
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            workerCertificate.setUploadDate(sdf.format(new Date()));
-            workerCertificateService.save(workerCertificate);
-            result.successMsg(MessageUtil.get("addSucess"));
-        } catch (Exception e) {
-            e.printStackTrace();
-            log.info(e.getMessage());
-            result.error500(MessageUtil.get("failErr"));
-        }
         return result;
     }
 
-    private void checkParam(WorkerCertificate workerCertificate) {
-        if (StringUtils.isNotBlank(workerCertificate.getEffectTime()) && StringUtils.isNotBlank(workerCertificate.getIssueTime())
-                && DateUtil.parse(workerCertificate.getEffectTime()).compareTo(DateUtil.parse(workerCertificate.getIssueTime())) < 0) {
-            throw new OpenAlertException("证书签发日期不能大于截止有效日期");
-        }
-    }
-
     /**
      * 编辑
      *
@@ -126,7 +110,7 @@ public class WorkerCertificateController {
         if (workerCertificate == null) {
             result.error500(MessageUtil.get("notFindErr"));
         } else {
-            boolean ok = workerCertificateService.removeById(MapUtils.getString(map, "id"));
+            boolean ok = workerCertificateService.delete(MapUtils.getString(map, "id"));
             if (ok) {
                 result.successMsg(MessageUtil.get("deleteSucess"));
             }

src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerCertificateService.java

@@ -20,4 +20,8 @@ public interface IWorkerCertificateService extends IService<WorkerCertificate> {
     Map<String, Object> selectProjectManageCertificateTotal(Map<String, Object> map);
 
     void edit(WorkerCertificate workerCertificate);
+
+    void add(WorkerCertificate workerCertificate);
+
+    boolean delete(String id);
 }

src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerCertificateServiceImpl.java

@@ -19,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -67,6 +68,28 @@ public class WorkerCertificateServiceImpl extends ServiceImpl<WorkerCertificateM
         checkParam(workerCertificate);
         updateById(workerCertificate);
 
+        updateExpired(workerCertificate);
+    }
+
+    @Override
+    public void add(WorkerCertificate workerCertificate) {
+        checkParam(workerCertificate);
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        workerCertificate.setUploadDate(sdf.format(new Date()));
+        save(workerCertificate);
+
+        updateExpired(workerCertificate);
+    }
+
+    @Override
+    public boolean delete(String id) {
+        WorkerCertificate workerCertificate = baseMapper.selectById(id);
+        baseMapper.deleteById(id);
+        updateExpired(workerCertificate);
+        return true;
+    }
+
+    private void updateExpired(WorkerCertificate workerCertificate) {
         List<WorkerCertificate> workerCertificates = workerCertificateMapper.selectList(new LambdaQueryWrapper<WorkerCertificate>()
                 .eq(WorkerCertificate::getWorkerId, workerCertificate.getWorkerId()));
         List<WorkerCertificate> expiredList = workerCertificates.stream().filter(c -> {
@@ -75,8 +98,10 @@ public class WorkerCertificateServiceImpl extends ServiceImpl<WorkerCertificateM
         if (CollUtil.isNotEmpty(expiredList)) {
             WorkerInfo workerInfo = workerInfoMapper.selectById(workerCertificate.getWorkerId());
             List<WorkerBlacklist> workerBlacklists = workerBlacklistMapper.selectList(new LambdaQueryWrapper<WorkerBlacklist>()
-                    .eq(WorkerBlacklist::getWorkerId, workerInfo.getId()));
+                    .eq(WorkerBlacklist::getWorkerId, workerInfo.getId())
-            if (CollUtil.isNotEmpty(workerBlacklists)) {
+                    .eq(WorkerBlacklist::getType, 1)
+            );
+            if (CollUtil.isEmpty(workerBlacklists)) {
                 //没有新增就新增
                 WorkerBlacklist black = new WorkerBlacklist();
                 black.setProjectSn(workerInfo.getProjectSn());