Merge remote-tracking branch 'origin/develop' into develop

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/policy/WorkerLogic.java

@@ -91,11 +91,11 @@ public class WorkerLogic {
                     .eq(WorkerPolicy::getPolicyType,"AC")
                     .eq(WorkerPolicy::getWebsitUserId,websitUser.getId())
                     .count() < 1 &&
-                    policyOrderService.lambdaQuery().eq(PolicyOrder::getWebsitUserId,websitUser.getId())
-                    .eq(PolicyOrder::getType,"AC").eq(PolicyOrder::getIsReceipt,IsYesNoEnum.NO.getKey()).count() < 1
 
-                    && workerPolicyService.lambdaQuery()
-                    .eq(WorkerPolicy::getWebsitUserId,websitUser.getId()).eq(WorkerPolicy::getPolicyType,"AC").count()< 1
+                    workerPolicyService.lambdaQuery().eq(WorkerPolicy::getWebsitUserId,websitUser.getId())
+                            .eq(WorkerPolicy::getPolicyType,"AC")
+                            .eq(WorkerPolicy::getWebsitUserId,websitUser.getId())
+                            .count() < 1
             ) {
 
                 AdminWebsit adminWebsit = adminWebsitService.getById(websitUser.getWebsitId());

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/workorder/ChangeOrderLogic.java

@@ -144,6 +144,8 @@ public class ChangeOrderLogic {
                 .set(!StringUtils.isEmpty(remark),PgOrderBase::getChangeRemark,remark)
                 .set(PgOrderBase::getAppointmentEndTime,appointmentEndTime)
                 .set(PgOrderBase::getLastOperatorAppointmentTime,new Date())
+                .set(PgOrderBase::getAppointmentRemark,remark)
+                .set(PgOrderBase::getChangeRemark,remark)
                 .update();
 
         this.addLog(id,remark,type,imgSrc);

mall-server-api/src/main/java/com/gree/mall/manager/controller/letter/LetterController.java

@@ -285,5 +285,16 @@ public class LetterController {
         return ResponseHelper.success();
     }
 
+    @PostMapping("/importProject")
+    @ApiOperation(value = "考核项目导入")
+    public ResponseHelper importProject(
+            @RequestParam MultipartFile file
+    ) throws RemoteServiceException, IOException {
+        List<Object> objects = ExcelUtils.importExcel(file);
+        letterLogic.importProject(objects);
+        return ResponseHelper.success();
+    }
+
+
 
 }

mall-server-api/src/main/java/com/gree/mall/manager/logic/LetterLogic.java

@@ -1,6 +1,7 @@
 package com.gree.mall.manager.logic;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.convert.Convert;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gree.mall.manager.bean.admin.AdminUserCom;
@@ -321,4 +322,29 @@ public class LetterLogic {
         leLetter.updateById();
         leLetterItem.insert();
     }
+
+    public void importProject(List<Object> objects) {
+        AdminUserCom adminUserCom = commonLogic.getAdminUser();
+        List<LeProject> leProjects = new ArrayList<>();
+
+        for (Object o : objects) {
+            List<Object> row = (List<Object>) o;
+
+            LeProject leProject = new LeProject();
+
+
+            leProject.setCompanyWechatId(adminUserCom.getCompanyWechatId());
+            leProject.setCompanyWechatName(adminUserCom.getCompanyName());
+            leProject.setProjectName((String)row.get(0));
+            leProject.setProjectReg((String)row.get(1));
+            leProject.setProjectText((String)row.get(2));
+            leProject.setPrice(Convert.toBigDecimal(row.get(3)));
+            leProject.setFraction(Convert.toBigDecimal(row.get(4)));
+
+
+            leProjects.add(leProject);
+        }
+
+        leProjectService.saveBatch(leProjects);
+    }
 }

mall-server-api/src/main/java/com/gree/mall/manager/logic/policy/AgreementLogic.java

@@ -796,15 +796,15 @@ public class AgreementLogic {
 
             String remark = StringUtil.isEmpty(websitUser.getOverdueRemark())?"":websitUser.getOverdueRemark();
             if ((StringUtil.isEmpty(remark) && user.getEndTime() != null && user.getEndTime().before(DateUtil.offsetMonth( DateUtil.beginOfDay(new Date()),1)))
-                    || (!StringUtil.isEmpty(remark) && remark.split("高空证").length < 1
-                    && user.getEndTime() != null && user.getEndTime().before(DateUtil.offsetMonth( DateUtil.beginOfDay(new Date()),1))) ){
+
+                    && user.getEndTime() != null && user.getEndTime().before(DateUtil.offsetMonth( DateUtil.beginOfDay(new Date()),1)) ){
                 remark = remark+"高空证"+DateUtil.format(user.getEndTime(),"yyyy-MM-dd");
             }
 
 
             if ((StringUtil.isEmpty(remark) && user.getIdCardEndTime() != null && user.getIdCardEndTime().before(DateUtil.offsetMonth( DateUtil.beginOfDay(new Date()),1)))
-                    || (!StringUtil.isEmpty(remark) && remark.split("身份证").length < 1
-                    && user.getIdCardEndTime() != null && user.getIdCardEndTime().before(DateUtil.offsetMonth( DateUtil.beginOfDay( DateUtil.beginOfDay(new Date())),1))) ){
+
+                    && user.getIdCardEndTime() != null && user.getIdCardEndTime().before(DateUtil.offsetMonth( DateUtil.beginOfDay( DateUtil.beginOfDay(new Date())),1)) ){
                 remark = remark+"身份证"+DateUtil.format(user.getIdCardEndTime(),"yyyy-MM-dd");
             }
 
@@ -817,10 +817,10 @@ public class AgreementLogic {
                 if (workerPolicy.getPolicyType().equals(PolicyTypeEnum.AC.getKey()) &&
                         (
                 (StringUtil.isEmpty(remark) && workerPolicy.getEndTime() != null && workerPolicy.getEndTime().before(DateUtil.offsetMonth( DateUtil.beginOfDay(new Date()),1)))
-                        || (!StringUtil.isEmpty(remark) && remark.split("意外险").length < 1
+
                         && workerPolicy.getEndTime() != null && workerPolicy.getEndTime().before(DateUtil.offsetMonth(  DateUtil.beginOfDay(new Date()),1))
                         && workerPolicy.getEndTime().before(DateUtil.offsetMonth(new Date(),1)))
-                        )
+
                 ) {
 
                     remark = remark+"意外险"+DateUtil.format(workerPolicy.getEndTime(),"yyyy-MM-dd");
@@ -828,10 +828,10 @@ public class AgreementLogic {
                 if (workerPolicy.getPolicyType().equals(PolicyTypeEnum.EM.getKey()) &&
                         (
                                 (StringUtil.isEmpty(remark) && workerPolicy.getEndTime() != null && workerPolicy.getEndTime().before(DateUtil.offsetMonth( DateUtil.beginOfDay(new Date()),1)))
-                                        || (!StringUtil.isEmpty(remark) && remark.split("雇主险").length < 1
+
                                         && workerPolicy.getEndTime() != null && workerPolicy.getEndTime().before(DateUtil.offsetMonth( DateUtil.beginOfDay(new Date()),1))
                                         && workerPolicy.getEndTime().before(DateUtil.offsetMonth(new Date(),1)))
-                        )
+
                 ) {
                     remark = remark+"雇主险"+DateUtil.format(workerPolicy.getEndTime(),"yyyy-MM-dd");
                 }
@@ -839,10 +839,10 @@ public class AgreementLogic {
                 if (workerPolicy.getPolicyType().equals(PolicyTypeEnum.IN.getKey()) &&
                         (
                                 (StringUtil.isEmpty(remark) && workerPolicy.getEndTime() != null && workerPolicy.getEndTime().before(DateUtil.offsetMonth( DateUtil.beginOfDay(new Date()),1)))
-                                        || (!StringUtil.isEmpty(remark) && remark.split("工伤险").length < 1
+
                                         && workerPolicy.getEndTime() != null && workerPolicy.getEndTime().before(DateUtil.offsetMonth( DateUtil.beginOfDay(new Date()),1))
                                         && workerPolicy.getEndTime().before(DateUtil.offsetMonth( DateUtil.beginOfDay(new Date()),1)))
-                        )
+
                 ) {
                     remark = remark+"工伤险"+DateUtil.format(workerPolicy.getEndTime(),"yyyy-MM-dd");
                 }