fixbug

qdlgxiemaosheng
1 parent 3ff114fd
Showing 7 changed files with 287 additions and 6 deletions
src/main/java/com/order/erp/domain/vo/admin/AdminUserResultVO.java
src/main/java/com/order/erp/domain/vo/order/OrderAuditLogResultVO.java
src/main/java/com/order/erp/domain/vo/order/OrderInfoResultVO.java
src/main/java/com/order/erp/domain/vo/order/OrderOptLogResultVO.java
src/main/java/com/order/erp/service/admin/impl/AdminUserServiceImpl.java
src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
src/main/java/com/order/erp/service/order/impl/OrderFieldLockApplyServiceImpl.java
@@ -92,4 +92,9 @@ public class AdminUserResultVO implements Serializable {
      */
     private String roleName;
+    /**
+     * 备注
+     */
+    private String remark;
+
 }
@@ -4,6 +4,7 @@ import lombok.*;
 import lombok.experimental.SuperBuilder;
 import java.io.Serializable;
+import java.time.LocalDateTime;
 /**
  * 订单操作信息表实体类
@@ -59,4 +60,6 @@ public class OrderAuditLogResultVO implements Serializable {
      */
     private String fields;
+    private LocalDateTime createTime;
+
 }
@@ -44,4 +44,9 @@ public class OrderInfoResultVO extends OrderBaseInfoVO implements Serializable {
      */
     private OrderLockFieldVO lockFields;
+    /**
+     * 进度条
+     */
+    private Double schedule;
+
 }
@@ -4,6 +4,7 @@ import lombok.*;
 import lombok.experimental.SuperBuilder;
 import java.io.Serializable;
+import java.time.LocalDateTime;
 /**
  * 订单操作信息表实体类
@@ -41,4 +42,6 @@ public class OrderOptLogResultVO implements Serializable {
      */
     private String fields;
+    private LocalDateTime createTime;
+
 }
@@ -164,6 +164,7 @@ public class AdminUserServiceImpl extends ServiceImpl&lt;AdminUserMapper, AdminUser
         return new LambdaQueryWrapper<AdminUserDO>()
                 .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
                 .eq(StringUtils.isNotBlank(queryVO.getUserName()), AdminUserDO::getUserName, queryVO.getUserName())
+                .eq(StringUtils.isNotBlank(queryVO.getNickName()), AdminUserDO::getNickName, queryVO.getNickName())
                 .eq(StringUtils.isNotBlank(queryVO.getPhone()), AdminUserDO::getPhone, queryVO.getPhone())
                 .eq(StringUtils.isNotBlank(queryVO.getEmail()), AdminUserDO::getEmail, queryVO.getEmail());
     }
@@ -179,9 +180,19 @@ public class AdminUserServiceImpl extends ServiceImpl&lt;AdminUserMapper, AdminUser
         if (Objects.nonNull(adminUserVO.getId())) {
             adminUserVO.setId(null);
         }
+        List<AdminUserDO> userDOS = list(new LambdaQueryWrapper<AdminUserDO>().eq(BaseDO::getEnableFlag,Constant.ENABLE_TEN)
+                .eq(AdminUserDO::getPhone,adminUserVO.getPhone()));
+        if (CollectionUtils.isNotEmpty(userDOS)) {
+            throw new BusinessException("手机号已被注册");
+        }
         AdminUserDO adminUserDo = BeanUtil.copyProperties(adminUserVO, AdminUserDO.class);
-        adminUserDo.setUserName(adminUserVO.getNickName());
-        adminUserDo.setGender(adminUserVO.getNickName());
+        if (StringUtils.isNotBlank(adminUserVO.getUserName())) {
+            adminUserDo.setNickName(adminUserVO.getUserName());
+        }
+        if (StringUtils.isNotBlank(adminUserVO.getNickName())) {
+            adminUserDo.setNickName(adminUserVO.getNickName());
+        }
+        adminUserDo.setGender("男");
         if (Objects.isNull(adminUserDo.getDeptId())) {
             adminUserDo.setDeptId(1L);
         }
@@ -37,6 +37,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.IOException;
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -157,6 +158,9 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
             // 填充字段锁定信息
             fillLockFields(resultVOList);
+            // 填充进度
+            fillSchedules(resultVOList);
+
             webVOPage.setRecords(resultVOList);
         }
         BeanUtils.copyProperties(page, webVOPage, "records");
@@ -435,6 +439,246 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
     /**
      * @param orderInfoResultVOList
      */
+    private void fillSchedules(List<OrderInfoResultVO> orderInfoResultVOList) {
+        if (CollectionUtils.isEmpty(orderInfoResultVOList)) {
+            return;
+        }
+
+        orderInfoResultVOList.forEach(x -> {
+            int i = 0;
+            if (isFillOrderBaseInfo(x)) {
+                i++;
+            }
+            if (isFillProfitInfo(x.getProfitAnalysisInfo())) {
+                i++;
+            }
+            if (isFillReportInfo(x.getReportInfo())) {
+                i++;
+            }
+            if (isFillTrackInfo(x.getTrackStageInfo())) {
+                i++;
+            }
+            if (isFillInspectionInfo(x.getInspectionStageInfo())) {
+                i++;
+            }
+            x.setSchedule(new BigDecimal(i).divide(new BigDecimal(Constant.FOUR)).doubleValue());
+        });
+    }
+
+    /**
+     * @param inspectionStageInfo
+     * @return
+     */
+    private boolean isFillInspectionInfo(OrderInspectionStageVO inspectionStageInfo) {
+        if (Objects.isNull(inspectionStageInfo)) {
+            return false;
+        }
+        if (StringUtils.isBlank(inspectionStageInfo.getMidCheckApplyTime())) {
+            return false;
+        }
+        if (StringUtils.isBlank(inspectionStageInfo.getMidCheckComment())) {
+            return false;
+        }
+        if (StringUtils.isBlank(inspectionStageInfo.getMidCheckResult())) {
+            return false;
+        }
+        if (StringUtils.isBlank(inspectionStageInfo.getEndCheckApplyTime())) {
+            return false;
+        }
+        if (StringUtils.isBlank(inspectionStageInfo.getSpecification())) {
+            return false;
+        }
+        if (StringUtils.isBlank(inspectionStageInfo.getFunctionality())) {
+            return false;
+        }
+        if (StringUtils.isBlank(inspectionStageInfo.getElectroplate())) {
+            return false;
+        }
+        if (StringUtils.isBlank(inspectionStageInfo.getBoxPacket())) {
+            return false;
+        }
+        if (StringUtils.isBlank(inspectionStageInfo.getEndCheckResult())) {
+            return false;
+        } else if ("FAIL".equals(inspectionStageInfo.getEndCheckResult())) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * @param trackStageVO
+     * @return
+     */
+    private boolean isFillTrackInfo(OrderTrackStageVO trackStageVO) {
+        if (Objects.isNull(trackStageVO)) {
+            return false;
+        }
+        if (StringUtils.isBlank(trackStageVO.getPpTime())) {
+            return false;
+        }
+        if (StringUtils.isBlank(trackStageVO.getPpConfirmResult())) {
+            return false;
+        }
+        if (StringUtils.isBlank(trackStageVO.getEsoSampleSendTime())) {
+            return false;
+        }
+        if (StringUtils.isBlank(trackStageVO.getShippmentSampleSendTime())) {
+            return false;
+        }
+        if (StringUtils.isBlank(trackStageVO.getShippmentSampleConfirmResult())) {
+            return false;
+        }
+        if (StringUtils.isBlank(trackStageVO.getSelfTestPassTime())) {
+            return false;
+        }
+        if (StringUtils.isBlank(trackStageVO.getAitexTestSendTime())) {
+            return false;
+        }
+        if (StringUtils.isBlank(trackStageVO.getAitexTestFinishResult())) {
+            return false;
+        }
+        if (StringUtils.isBlank(trackStageVO.getSgsTestSendTime())) {
+            return false;
+        }
+        if (StringUtils.isBlank(trackStageVO.getSgsTestFinishResult())) {
+            return false;
+        }
+        if (StringUtils.isBlank(trackStageVO.getBarcodeStickerArrivalTime())) {
+            return false;
+        }
+        if (StringUtils.isBlank(trackStageVO.getLatestArrivalTime())) {
+            return false;
+        }
+        if (StringUtils.isBlank(trackStageVO.getLatestBkTime())) {
+            return false;
+        }
+        return true;
+    }
+
+
+    /**
+     * @param reportInfo
+     * @return
+     */
+    private boolean isFillReportInfo(OrderCompletionReportVO reportInfo) {
+        if (Objects.isNull(reportInfo)) {
+            return false;
+        }
+        if (StringUtils.isBlank(reportInfo.getIdeaSource())) {
+            return false;
+        }
+        if (StringUtils.isBlank(reportInfo.getManualPreform())) {
+            return false;
+        }
+        if (Objects.isNull(reportInfo.getIdeaManualRate())) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * @param profitAnalysisInfo
+     * @return
+     */
+    private boolean isFillProfitInfo(OrderProfitAnalysisVO profitAnalysisInfo) {
+        if (Objects.isNull(profitAnalysisInfo)) {
+            return false;
+        }
+        if (Objects.isNull(profitAnalysisInfo.getCustomerPrice())) {
+            return false;
+        }
+        if (Objects.isNull(profitAnalysisInfo.getCustomerTotalPrice())) {
+            return false;
+        }
+        if (Objects.isNull(profitAnalysisInfo.getProductionDepartmentPrice())) {
+            return false;
+        }
+        if (Objects.isNull(profitAnalysisInfo.getProductionDepartmentTotalPrice())) {
+            return false;
+        }
+        if (Objects.isNull(profitAnalysisInfo.getPacketPrice())) {
+            return false;
+        }
+        if (Objects.isNull(profitAnalysisInfo.getPacketTotalPrice())) {
+            return false;
+        }
+        if (Objects.isNull(profitAnalysisInfo.getExchangeRate())) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * @param resultVO
+     * @return
+     */
+    private boolean isFillOrderBaseInfo(OrderInfoResultVO resultVO) {
+        if (Objects.isNull(resultVO)) {
+            return false;
+        }
+        if (StringUtils.isBlank(resultVO.getCustomerCode())) {
+            return false;
+        }
+        if (StringUtils.isBlank(resultVO.getProjectNo())) {
+            return false;
+        }
+        if (StringUtils.isBlank(resultVO.getProductionDepartment())) {
+            return false;
+        }
+        if (StringUtils.isBlank(resultVO.getInnerNo())) {
+            return false;
+        }
+        if (StringUtils.isBlank(resultVO.getCustomerPo())) {
+            return false;
+        }
+        if (StringUtils.isBlank(resultVO.getCustomerStyle())) {
+            return false;
+        }
+        if (StringUtils.isBlank(resultVO.getModeleLo())) {
+            return false;
+        }
+        if (StringUtils.isBlank(resultVO.getCollection())) {
+            return false;
+        }
+        if (StringUtils.isBlank(resultVO.getPoColor())) {
+            return false;
+        }
+        if (StringUtils.isBlank(resultVO.getCnColor())) {
+            return false;
+        }
+        if (StringUtils.isBlank(resultVO.getPicUrl())) {
+            return false;
+        }
+        if (StringUtils.isBlank(resultVO.getProductionComment())) {
+            return false;
+        }
+        if (Objects.isNull(resultVO.getOrderCount())) {
+            return false;
+        }
+        if (StringUtils.isBlank(resultVO.getOrderComposition())) {
+            return false;
+        }
+        if (StringUtils.isBlank(resultVO.getProductStyle())) {
+            return false;
+        }
+        if (StringUtils.isBlank(resultVO.getProductionDepartmentConsignTime())) {
+            return false;
+        }
+        if (StringUtils.isBlank(resultVO.getOrderHodTime())) {
+            return false;
+        }
+        if (StringUtils.isBlank(resultVO.getOutboundType())) {
+            return false;
+        }
+        if (StringUtils.isBlank(resultVO.getPacketType())) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * @param orderInfoResultVOList
+     */
     private void fillLockFields(List<OrderInfoResultVO> orderInfoResultVOList) {
         if (CollectionUtils.isEmpty(orderInfoResultVOList)) {
             return;
@@ -593,7 +837,6 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
     }
     /**
-     *
      * @param orderId
      * @param userId
      * @param optType
@@ -605,10 +848,9 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
     }
     /**
-     *
      * @param updateVO
      */
-    private void initOrderId(OrderUpdateVO updateVO){
+    private void initOrderId(OrderUpdateVO updateVO) {
         if (Objects.nonNull(updateVO.getBaseInfo())) {
             updateVO.getBaseInfo().setId(updateVO.getOrderId());
         }
@@ -117,7 +117,19 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
                 BeanUtils.copyProperties(x, resultVO);
                 String fields = x.getFields();
                 if (StringUtils.isNotBlank(fields)) {
-                    resultVO.setFieldInfos(JSONObject.parseObject(fields, OrderLockFieldVO.class));
+                    if (ApplyTypeEnum.FIELD_EDIT_APPLY.getType() == x.getType()) {
+                        resultVO.setFieldInfos(JSONObject.parseObject(fields, OrderLockFieldVO.class));
+                    }
+                    if (ApplyTypeEnum.ORDER_REPORT_APPLY.getType() == x.getType()) {
+                        OrderLockFieldVO fieldVO = new OrderLockFieldVO();
+                        fieldVO.setReportFields(JSONObject.parseObject(fields, OrderCompletionReportFieldVO.class));
+                        resultVO.setFieldInfos(fieldVO);
+                    }
+                    if (ApplyTypeEnum.ORDER_PROFIT_APPLY.getType() == x.getType()) {
+                        OrderLockFieldVO fieldVO = new OrderLockFieldVO();
+                        fieldVO.setProfitAnalysisFields(JSONObject.parseObject(fields, OrderProfitAnalysisFieldVO.class));
+                        resultVO.setFieldInfos(fieldVO);
+                    }
                 }
                 return resultVO;
             }).collect(Collectors.toList());