优化

platform-dao/src/main/java/com/platform/dao/mapper/repair/RepairApplicationFormMapper.java

@@ -52,4 +52,10 @@ public interface RepairApplicationFormMapper extends MyMapper<RepairApplicationF
      * @return
      */
     RepairApplicationFormVO getWorkplaceRepairSumData(RepairApplicationFormDTO model);
+
+    /**
+     * 修改转派
+     * @param model
+     */
+    void updateForRepairDispatch(RepairApplicationForm model);
 }

platform-dao/src/main/resources/mapper/repair/RepairApplicationFormMapper.xml

@@ -185,4 +185,88 @@
             </if>
         </where>
     </select>
+
+    <!-- 修改派工维修单 -->
+    <update id="updateForRepairDispatch" parameterType="com.platform.dao.entity.repair.RepairApplicationForm">
+        update t_repair_application_form
+        <set>
+            repair_end_time = null,
+            <if test="sbId != null">
+            sb_id = #{sbId},
+            </if>
+            <if test="needStop != null">
+                need_stop = #{needStop},
+            </if>
+            <if test="no != null">
+                no = #{no},
+            </if>
+            <if test="source != null">
+                source = #{source},
+            </if>
+            <if test="applyTime != null">
+                apply_time = #{applyTime},
+            </if>
+            <if test="level != null">
+                level = #{level},
+            </if>
+            <if test="content != null">
+                content = #{content},
+            </if>
+            <if test="status != null">
+                status= #{status},
+            </if>
+            <if test="repairStartTime != null">
+                repair_start_time = #{repairStartTime},
+            </if>
+            <if test="repairDispatchList != null">
+                repair_dispatch_list = #{repairDispatchList},
+            </if>
+            <if test="repairDispatchRemark != null">
+                repair_dispatch_remark = #{repairDispatchRemark},
+            </if>
+            <if test="receiveMinutes != null">
+                receive_minutes = #{receiveMinutes},
+            </if>
+            <if test="repairMinutes != null">
+                repair_minutes = #{repairMinutes},
+            </if>
+            <if test="dealMinutes != null">
+                deal_minutes = #{dealMinutes},
+            </if>
+            <if test="repairOvertime != null">
+                repair_overtime = #{repairOvertime},
+            </if>
+            <if test="receiveOvertime != null">
+                receive_overtime = #{receiveOvertime},
+            </if>
+            <if test="userId != null">
+                user_id = #{userId},
+            </if>
+            <if test="repairUserId != null">
+                repair_user_id = #{repairUserId},
+            </if>
+            <if test="checkUserId != null">
+                check_user_id = #{checkUserId},
+            </if>
+            <if test="checkStartTime != null">
+                check_start_time = #{checkStartTime},
+            </if>
+            <if test="checkContent != null">
+                check_content = #{checkContent},
+            </if>
+            <if test="createdTime != null">
+                created_time = #{createdTime},
+            </if>
+            <if test="updateTime != null">
+                update_time = #{updateTime},
+            </if>
+            <if test="actualUser != null">
+                actual_user = #{actualUser},
+            </if>
+            <if test="type != null">
+                type = #{type},
+            </if>
+        </set>
+        where id = #{id}
+    </update>
 </mapper>

platform-rest/src/main/java/com/platform/rest/controller/repair/RepairFeeController.java

@@ -54,8 +54,8 @@ public class RepairFeeController {
   @PreAuthorize("@pms.hasPermission('repair-fees-add')")
   public R save(@Validated({AddGroup.class}) @RequestBody RepairFeeDTO repairFeeDTO) {
     System.out.println("---------------------------------"+JsonUtils.objectToJson(repairFeeDTO));
-    return new R<>(null);
-    //return new R<>(repairFeeService.saveModelByDTO(repairFeeDTO));
+    //return new R<>(null);
+    return new R<>(repairFeeService.saveModelByDTO(repairFeeDTO));
   }
 
   /**

platform-service/src/main/java/com/platform/service/repair/impl/RepairApplicationFormServiceImpl.java

@@ -609,7 +609,8 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
         applicationForm.setStatus(RepairApplicationFormStatusEnum.PROCESSING.getValue());
         applicationForm.setRepairStartTime(LocalDateTime.now());
         applicationForm.setUpdateTime(LocalDateTime.now());
-        super.modModelByPrimaryKey(applicationForm);
+        // 转派其他人要将维修结束时间置空'
+        mapper.updateForRepairDispatch(applicationForm);
 
         SysUser repairUser = userMapper.selectByPrimaryKey(model.getRepairUserId());
         SpringContextHolder.publishEvent(new WorkplaceBacklogEvent(WorkplaceBacklogTypeEnum.REPAIR.getValue(), WorkplaceBacklogDetailTypeEnum.REPAIR_DISPATCH.getValue(),
@@ -957,42 +958,55 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
      */
     private void packageInfo(Integer type,RepairApplicationFormVO result,WorkplaceRepairVO vo){
         BigDecimal tempNum = result.getTempTotalNum();
+        BigDecimal tempFee = result.getTempTotalNum();
         if(RepairApplicationFormTypeEnum.IN.getValue() == type){
-            vo.setRepairFee(vo.getRepairFee().add(result.getTempTotalFee()));
-            vo.setRepairTotalNum(vo.getRepairTotalNum().add(tempNum));
             // 内部维修
             switch (result.getStatus().intValue()){
                 case CommonConstants.NOT_ALLOCATED:
                     vo.setCompletedRepairNum(vo.getCompletedRepairNum().add(tempNum));
+                    vo.setRepairFee(vo.getRepairFee().add(tempFee));
+                    vo.setRepairTotalNum(vo.getRepairTotalNum().add(tempNum));
                     break;
                 case CommonConstants.PROCESSING:
                     vo.setWaitForRepairNum(vo.getWaitForRepairNum().add(tempNum));
+                    vo.setRepairFee(vo.getRepairFee().add(tempFee));
+                    vo.setRepairTotalNum(vo.getRepairTotalNum().add(tempNum));
                     break;
                 case CommonConstants.WAIT_SUBMIT:
                 case CommonConstants.NOT_ACCEPTANCE:
                     vo.setVerifyRepairNum(vo.getVerifyRepairNum().add(tempNum));
+                    vo.setRepairFee(vo.getRepairFee().add(tempFee));
+                    vo.setRepairTotalNum(vo.getRepairTotalNum().add(tempNum));
                     break;
                 case CommonConstants.REBACK:
                     vo.setRefusedRepairNum(vo.getRefusedRepairNum().add(tempNum));
+                    vo.setRepairFee(vo.getRepairFee().add(tempFee));
+                    vo.setRepairTotalNum(vo.getRepairTotalNum().add(tempNum));
                     break;
             }
         }else if(RepairApplicationFormTypeEnum.OUT.getValue() == type) {
-            vo.setOutRepairFee(vo.getOutRepairFee().add(result.getTempTotalFee()));
-            vo.setOutRepairTotalNum(vo.getOutRepairTotalNum().add(tempNum));
             // 委外
             switch (result.getStatus()){
                 case CommonConstants.NOT_ALLOCATED:
                     vo.setOutCompletedRepairNum(vo.getOutCompletedRepairNum().add(tempNum));
+                    vo.setOutRepairFee(vo.getOutRepairFee().add(tempFee));
+                    vo.setOutRepairTotalNum(vo.getOutRepairTotalNum().add(tempNum));
                     break;
                 case CommonConstants.PROCESSING:
                     vo.setOutWaitForRepairNum(vo.getOutWaitForRepairNum().add(tempNum));
+                    vo.setOutRepairFee(vo.getOutRepairFee().add(tempFee));
+                    vo.setOutRepairTotalNum(vo.getOutRepairTotalNum().add(tempNum));
                     break;
                 case CommonConstants.WAIT_SUBMIT:
                 case CommonConstants.NOT_ACCEPTANCE:
                     vo.setOutVerifyRepairNum(vo.getOutVerifyRepairNum().add(tempNum));
+                    vo.setOutRepairFee(vo.getOutRepairFee().add(tempFee));
+                    vo.setOutRepairTotalNum(vo.getOutRepairTotalNum().add(tempNum));
                     break;
                 case CommonConstants.REBACK:
                     vo.setOutRefusedRepairNum(vo.getOutRefusedRepairNum().add(tempNum));
+                    vo.setOutRepairFee(vo.getOutRepairFee().add(tempFee));
+                    vo.setOutRepairTotalNum(vo.getOutRepairTotalNum().add(tempNum));
                     break;
             }
         }