Merge branch 'master' of http://47.108.172.52:3000/dayou/item-management-1phase

biz-base/src/main/resources/application-prod.yml

@@ -41,9 +41,9 @@ spring:
 dfs:
   path: /opt/dfs
   domain: /dfs
-  domainName: https://mbs.scdayou.com/dfs
+  domainName: http://mbs.scdayou.com/dfs
   code: /code
-  domainRoot: https://mbs.scdayou.com/admin
+  domainRoot: http://mbs.scdayou.com/admin
   luceneDir: /luceneDir
 
 

service/src/main/java/com/dayou/service/IPersonalService.java

@@ -60,4 +60,8 @@ public interface IPersonalService extends IService<Personal> {
     Boolean doAllotOrder(PersonalAllotOrderDTO dto);
 
     Boolean changeCredentials(PersonalVO personal);
+
+    Long nextInwardStaff();
+
+    void fixationInwardStaff(Long personalId);
 }

service/src/main/java/com/dayou/service/impl/PersonalServiceImpl.java

@@ -127,7 +127,8 @@ public class PersonalServiceImpl extends ServiceImpl<PersonalMapper, Personal> i
     public WorkNodeCommit add(Personal personal){
         personal.setOrderId(businessNumberService.takeOrderNumber());
         //确定内业人员
-        personal.setInwardStaff(nextInwardStaff());
+        //下单时暂不确定内业人员，客户经理报价反馈后再确定。否则会有内业轮空。
+        //personal.setInwardStaff(nextInwardStaff());
         //确定定价内业人员
         personal.setPricingStaff(aimPriceStaff());
         this.save(personal);
@@ -273,7 +274,7 @@ public class PersonalServiceImpl extends ServiceImpl<PersonalMapper, Personal> i
      * 确定内业人员
      * @return
      */
-    private synchronized Long nextInwardStaff(){
+    public synchronized Long nextInwardStaff(){
         GlobalConfig inwardStaffRoll = globalConfigService.getGlobalConfig(GlobalConfigEnum.DEPARTMENT_TURNS.getCode(), GlobalConfigEnum.DepartmentTurns.INWARD_STAFF_ROLL.getCode());
         List<User> users = userService.simplePostName(PERSONAL_INWARD);
         if (CollectionUtil.isEmpty(users)){
@@ -296,6 +297,16 @@ public class PersonalServiceImpl extends ServiceImpl<PersonalMapper, Personal> i
         return nextStaffId;
     }
 
+    @Transactional
+    @Override
+    public void fixationInwardStaff(Long personalId) {
+        Personal per = this.getOne(new LambdaQueryWrapper<Personal>().select(Personal::getId,Personal::getInwardStaff).eq(BaseEntity::getId, personalId).eq(BaseEntity::getDeleted, Boolean.FALSE));
+        if (per.getInwardStaff() == null){
+            Long nextStaffId = this.nextInwardStaff();
+            this.update(new LambdaUpdateWrapper<Personal>().set(Personal::getInwardStaff,nextStaffId).eq(BaseEntity::getId,personalId));
+        }
+    }
+
     /**
      * 确定定价内业
      * @return

service/src/main/java/com/dayou/service/impl/PersonalTargetServiceImpl.java

@@ -84,8 +84,12 @@ public class PersonalTargetServiceImpl extends ServiceImpl<PersonalTargetMapper,
             List<String> feedbacks = JSON.parseArray(target.getFeedback(), String.class);
             feedbacks = CollectionUtil.isEmpty(feedbacks)?new ArrayList<>():feedbacks;
             feedbacks.add(feedback);
-            return  this.update(new LambdaUpdateWrapper<PersonalTarget>().set(PersonalTarget::getFeedback,JSON.toJSONString(feedbacks))
+            this.update(new LambdaUpdateWrapper<PersonalTarget>().set(PersonalTarget::getFeedback,JSON.toJSONString(feedbacks))
                     .eq(BaseEntity::getId,personalTarget.getId()));
+            //确定产品内业
+            Long personalId = personalTarget.getPersonalId();
+            personalService.fixationInwardStaff(personalId);
+
         }
         return Boolean.FALSE;
     }
@@ -164,7 +168,13 @@ public class PersonalTargetServiceImpl extends ServiceImpl<PersonalTargetMapper,
     @Override
     public Boolean doFeedback(TaskRecordDTO<PersonalTarget> taskRecordDTO) {
         PersonalTarget taskData = taskRecordDTO.getTaskData();
-        return this.update(new LambdaUpdateWrapper<PersonalTarget>().eq(BaseEntity::getId,taskData.getId()).set(PersonalTarget::getFeedback,taskData.getFeedback()));
+        String feedback = taskData.getFeedback();
+        if (StrUtil.isNotBlank(feedback)){
+            //确定内业人员
+            personalService.fixationInwardStaff(taskData.getPersonalId());
+            return this.update(new LambdaUpdateWrapper<PersonalTarget>().eq(BaseEntity::getId,taskData.getId()).set(PersonalTarget::getFeedback, feedback));
+        }
+        return Boolean.FALSE;
     }
 
     @Override