ll

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

@@ -12,6 +12,7 @@ import com.gree.mall.manager.bean.policy.PolicyOrderVO;
 import com.gree.mall.manager.bean.policy.PolicyVo;
 import com.gree.mall.manager.commonmapper.PolicyCMapper;
 import com.gree.mall.manager.enums.IsYesNoEnum;
+import com.gree.mall.manager.enums.PolicyOrderEmStutasEnum;
 import com.gree.mall.manager.logic.common.CommonLogic;
 import com.gree.mall.manager.plus.entity.*;
 import com.gree.mall.manager.plus.service.AdminWebsitService;
@@ -123,7 +124,7 @@ public class PolicyOrderLogic {
                 workerPolicy.setPolicyType("IN");
                 workerPolicy.setStartTime(DateUtil.parse((String) row.get(9), "yyyy-MM-dd"));
                 workerPolicy.setEndTime(DateUtil.endOfDay(DateUtil.parse((String) row.get(10), "yyyy-MM-dd")));
-
+                workerPolicy.setWebsitUserId(policyOrder.getWebsitUserId());
                 workerPolicy.setWebsitId(policyOrder.getWebsitId());
                 workerPolicy.setWebsitName(policyOrder.getWebsitName());
                 workerPolicy.setWorkerName(policyOrder.getWorkerName());
@@ -169,6 +170,16 @@ public class PolicyOrderLogic {
             WebsitUser websitUser = websitUserService.lambdaQuery().eq(WebsitUser::getWebsitId, (String) row.get(1))
                     .eq(WebsitUser::getWorkerNumber, (String) row.get(3)).one();
 
+            PolicyOrder policyOrdery = policyOrderService.lambdaQuery()
+                    .eq(PolicyOrder::getWebsitId, (String) row.get(1))
+                    .eq(PolicyOrder::getWorkerNumber, (String) row.get(3))
+                    .eq(PolicyOrder::getType, "EM")
+                    .eq(PolicyOrder::getPolicyOrderStatus, PolicyOrderEmStutasEnum.XG.getKey(),
+                            PolicyOrderEmStutasEnum.DTH.getKey(),
+                            PolicyOrderEmStutasEnum..getKey(),
+                            PolicyOrderEmStutasEnum.XG.getKey(),
+                    ).one();
+
             PolicyOrder policyOrder = new PolicyOrder();
             policyOrder.setId("PW"+ IdWorker.getIdStr());