.

mall-server-api/src/main/java/com/gree/mall/manager/bean/listvo/workorder/UserWaitVO.java

@@ -22,8 +22,8 @@ public class UserWaitVO {
     @ApiModelProperty(value = "手机号")
     private String mobile;
 
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "网点id")
+
+    @ApiModelProperty(value = "网点编号")
     private String websitId;
 
     @ApiModelProperty(value = "网点名称")

mall-server-api/src/main/java/com/gree/mall/manager/bean/policy/MailBoxSendRecordVo.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.gree.mall.manager.annotation.ZfireField;
 import com.gree.mall.manager.enums.IsYesNoEnum;
 import com.gree.mall.manager.enums.MailboxStatusEnum;
+import com.gree.mall.manager.enums.PolicyTypeEnum;
 import com.gree.mall.manager.plus.entity.MailboxSendRecord;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -23,7 +24,7 @@ public class MailBoxSendRecordVo  {
     private String id;
 
     @ApiModelProperty(value = "保险类型")
-    private String policyType;
+    private PolicyTypeEnum policyType;
 
     @ApiModelProperty(value = "发送批次")
     private String sendBatch;
@@ -58,17 +59,12 @@ public class MailBoxSendRecordVo  {
     @TableField(fill = FieldFill.INSERT)
     private Date createTime;
 
-    @ApiModelProperty(value = "创建人")
-    @TableField(fill = FieldFill.INSERT)
-    private String createBy;
 
     @ApiModelProperty(value = "修改时间")
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Date updateTime;
 
-    @ApiModelProperty(value = "修改人")
-    @TableField(fill = FieldFill.INSERT_UPDATE)
-    private String updateBy;
+
 
 
 }

mall-server-api/src/main/java/com/gree/mall/manager/bean/policy/PolicyOrderEmVO.java

@@ -15,7 +15,7 @@ import java.util.Date;
 
 @ApiModel
 @Data
-public class PolicyOrderEmVO   {
+public class PolicyOrderEmVO    {
 
     @ApiModelProperty(value = "订单号")
     @TableId(value = "id", type = IdType.ID_WORKER_STR)
@@ -28,7 +28,7 @@ public class PolicyOrderEmVO   {
     private String policyName;
 
     @ApiModelProperty(value = "保单编号")
-    private String policyOrderId;
+    private String policyNumber;
 
     @ApiModelProperty(value = "所属公司")
     private String belongCompany;

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

@@ -76,6 +76,7 @@ public class WorkerManagerLogic {
         websitUser.updateById();
     }
 
+    @Transactional(rollbackFor = Exception.class)
     public void quit(String id) {
 
         WebsitUser websitUserBean = websitUserService.getById(id);
@@ -514,7 +515,8 @@ public class WorkerManagerLogic {
 
         AdminWebsit adminWebsit = adminWebsitService.getById(workerManagerBean.getWebsitId());
 
-        List<WorkerPolicy> workerPolicies = workerManagerBean.getWorkerPolicies().stream().filter(item -> item.getPolicyType().equals("AC")).collect(Collectors.toList());
+        List<WorkerPolicy> workerPolicies = workerManagerBean.getWorkerPolicies().stream().filter(item -> item.getPolicyType()
+                .equals("AC")).collect(Collectors.toList());
 
         if (CollectionUtils.isEmpty(workerPolicies))
             throw new RemoteServiceException("请填工程师意外险");

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

@@ -325,6 +325,10 @@ public class UserLogic {
                 userWait.setCompany(company);
                 userWait.setPolicyStartTime(DateUtil.parse(policy_start_time, "yyyy/MM/dd"));
                 userWait.setPolicyEndTime(DateUtil.offsetSecond(DateUtil.endOfDay(DateUtil.parse(policy_end_time, "yyyy/MM/dd")),-1));
+
+                if (userWait.getPolicyEndTime().before(new Date()))
+                    throw new RemoteServiceException(userWait.getWorkerNumber()+"导入师傅保险已过期");
+
                 userWait.setPolicyName(policy_name);
                 userWait.setPolicyOrder(policy_order);
             }else {
@@ -335,6 +339,9 @@ public class UserLogic {
                 userWait.setEmCompany(em_company);
                 userWait.setEmPolicyStartTime(DateUtil.parse(em_policy_start_time, "yyyy/MM/dd"));
                 userWait.setEmPolicyEndTime(DateUtil.offsetSecond(DateUtil.endOfDay(DateUtil.parse(em_policy_end_time, "yyyy/MM/dd")),-1));
+
+                if (userWait.getEmPolicyEndTime().before(new Date()))
+                    throw new RemoteServiceException(userWait.getWorkerNumber()+"导入师傅保险已过期");
                 userWait.setEmPolicyName(em_policy_name);
                 userWait.setEmPolicyOrder(em_policy_order);
             }
@@ -343,6 +350,8 @@ public class UserLogic {
                 userWait.setInCompany(in_company);
                 userWait.setInPolicyStartTime(DateUtil.parse(in_policy_start_time, "yyyy/MM/dd"));
                 userWait.setInPolicyEndTime(DateUtil.offsetSecond(DateUtil.endOfDay(DateUtil.parse(in_policy_end_time, "yyyy/MM/dd")),-1));
+                if (userWait.getInPolicyEndTime().before(new Date()))
+                    throw new RemoteServiceException(userWait.getWorkerNumber()+"导入师傅保险已过期");
                 userWait.setInPolicyName(in_policy_name);
                 userWait.setInPolicyOrder(in_policy_order);
             }

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

@@ -74,7 +74,7 @@ public class OrderLogLogic {
                 .eq(StringUtils.isNotBlank(adminUser.getCompanyWechatId()),
                         PgOrderOperatorLog::getCompanyWechatId,
                         adminUser.getCompanyWechatId())
-                .orderByDesc(PgOrderOperatorLog::getId)
+                .orderByDesc(PgOrderOperatorLog::getCreateTime)
                 .list();
         return list;
     }

mall-server-api/src/main/resources/mapper/CommonMapper.xml

@@ -106,7 +106,7 @@
         <if test="ex.isGroupByWorkerId != null and ex.isGroupByWorkerId == true">
             GROUP BY a.worker_number
         </if>
-        ORDER BY FIELD(b.examine_status,'WAIT','OK','FAIL'),a.create_time DESC
+        ORDER BY b.create_time DESC
     </select>
 
     <select id="userServiceList" resultType="com.gree.mall.manager.bean.listvo.User2VO">