三单派发接口完善

business-common/src/main/java/com/rongwei/bscommon/sys/dao/ZhcxPmqManagementDistributionDao.java

@@ -25,4 +25,10 @@ public interface ZhcxPmqManagementDistributionDao extends BaseMapper<ZhcxPmqMana
                                                               @Param("pid") String pid,
                                                               @Param("machineid") String machineid,
                                                               @Param("confirmerid") String confirmerid);
+
+    /**
+     * 更新第二层的派单状态
+     * @param id id
+     */
+    void updateDispatchStatus(@Param("id") String id);
 }

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxCommissionCheckParameterSetDetalServiceImpl.java

@@ -37,12 +37,16 @@ public class ZhcxCommissionCheckParameterSetDetalServiceImpl extends ServiceImpl
         }
         List<ZhcxCommissionCheckParameterSetDetalDo> list = baseMapper.getAllByCheckidOrId(masterId);
         if (list.size() != 1) {
-            return R.ok("试车参数数据异常");
+            return R.error("试车参数数据异常");
         }
         ZhcxCommissionCheckParameterSetDetalDo parameterSetDetalDo = list.get(0);
         // 前端已经计算了 填入开始时间
         if (Objects.isNull(parameterSetDetalDo.getBegindate())) {
             parameterSetDetalDo.setBegindate(parameterSetDetalDo.getRecentlyTime());
+            // 2024-11-14 如果开始时间为空不计算结束日期
+            if (Objects.isNull(parameterSetDetalDo.getRecentlyTime())) {
+                return R.ok("试车开始时间为空");
+            }
         }
         // 剩余天数 = 难度系数*预估剩余天数
         if (StringUtils.isEmpty(parameterSetDetalDo.getDifficultyfactor())) {

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxPmqManagementDistributionServiceImpl.java

@@ -90,6 +90,8 @@ public class ZhcxPmqManagementDistributionServiceImpl extends ServiceImpl<ZhcxPm
         if(!updateList.isEmpty()){
             detailService.updateBatchById(updateList);
         }
+        // 更新第二层的派单状态
+        baseMapper.updateDispatchStatus(pid);
         return R.ok("生成派单成功");
     }
 }

business-common/src/main/resources/mybatis/business/ZhcxPmqManagementDistributionDao.xml

@@ -2,6 +2,14 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.rongwei.bscommon.sys.dao.ZhcxPmqManagementDistributionDao">
+    <update id="updateDispatchStatus">
+        UPDATE
+            INCONTROL.ZHCX_PMQ_MANAGEMENT_RECORED
+        SET
+            DISPATCHSTATUS = '1'
+        WHERE
+            ID = #{id}
+    </update>
 
 
     <select id="selectListByPidForConfirmer"

business-entity/src/main/java/com/rongwei/bsentity/domain/ZhcxPmqManagementRecoredDo.java

@@ -115,5 +115,9 @@ public class ZhcxPmqManagementRecoredDo extends BaseDo {
     @TableField("TOTALTIMES")
     private Integer totaltimes;
 
-
+    /**
+     * 派单状态:默认为0(待派单)
+     */
+    @TableField("DISPATCHSTATUS")
+    private String dispatchstatus;
 }