问题修改

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java

@@ -492,4 +492,9 @@ public interface BaseVehicleFeign {
     @GetMapping("/getSystemVehicle")
     @ResponseBody
     ResultBean<BasePurchSystemVo> getSystemVehicle(@RequestParam("sid")String sid);
+
+    @ApiOperation("根据车辆sid修改锁定状态")
+    @GetMapping("/updateLockedState")
+    @ResponseBody
+    ResultBean updateLockedState(@RequestParam("vehSid") String vehSid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java

@@ -493,4 +493,7 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
     BasePurchSystemVo getSystem(@Param("useOrgSid") String useOrgSid, @Param("purchaseSystemSid") String purchaseSystemSid);
 
     void updateVehicleStateAndSaleDate(String sid);
+
+    @Update("update base_vehicle set lockedState = #{code},lockedStateValue = #{remarks} where sid = #{vehSid}")
+    ResultBean updateLockedState(@Param("vehSid") String vehSid,@Param("code") String code,@Param("remarks") String remarks);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java

@@ -1462,6 +1462,11 @@ public class BaseVehicleRest implements BaseVehicleFeign {
         return baseVehicleService.getSystemVehicle(sid);
     }
 
+    @Override
+    public ResultBean updateLockedState(String vehSid) {
+        return baseVehicleService.updateLockedState(vehSid);
+    }
+
     @Override
     public ResultBean<List<AppBaseVehicleOrderVo>> selectAppListOne(String modelSid, String configSid, String orgSid, List<String> list) {
         return baseVehicleService.selectAppListOne(modelSid, configSid, orgSid, list);

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

@@ -3648,4 +3648,8 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
     public void updateVehicleStateAndSaleDate(String sid) {
         baseMapper.updateVehicleStateAndSaleDate(sid);
     }
+
+    public ResultBean updateLockedState(String vehSid) {
+        return baseMapper.updateLockedState(vehSid, VehicleState.LockEnum.UN_LOCK.getCode(), VehicleState.LockEnum.UN_LOCK.getRemarks());
+    }
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyDetailsVo.java

@@ -58,6 +58,8 @@ public class BusSalesOrderReturnVehApplyDetailsVo implements Vo {
 
     @ApiModelProperty(value = "备注")
     private String remarks;
+    @ApiModelProperty("申请人sid")
+    private String createBySid; // 申请人sid
 	@ApiModelProperty("申请人姓名")
     private String createByName; // 申请人姓名
 	@ApiModelProperty("销售类型key")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyVo.java

@@ -72,4 +72,8 @@ public class BusSalesOrderReturnVehApplyVo implements Vo {
     private String stopRemarks; // 终止原因
 	@ApiModelProperty("节点状态")
     private String nodeState; // 节点状态
+    @ApiModelProperty("流程实例id")
+    private String procInsId; // 流程实例id
+    @ApiModelProperty("任务编号id")
+    private String deployId; // 任务编号id
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyMapper.xml

@@ -1,36 +1,49 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yxt.anrui.buscenter.biz.bussalesorderreturnvehapply.BusSalesOrderReturnVehApplyMapper">
-<!--    <where> ${ew.sqlSegment} </where>-->
-<!--    ${ew.customSqlSegment} -->
-	<select id="selectPageVo" resultType="com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.BusSalesOrderReturnVehApplyVo">
-		SELECT * FROM bus_sales_order_return_veh_apply <where> ${ew.sqlSegment} </where>
-	</select>
-	
-	<select id="selectListAllVo" resultType="com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.BusSalesOrderReturnVehApplyVo">
-		SELECT * FROM bus_sales_order_return_veh_apply <where> ${ew.sqlSegment} </where>
-	</select>
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo"
+            resultType="com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.BusSalesOrderReturnVehApplyVo">
+        SELECT
+        *,
+        procInstId AS procInsId,
+        taskId AS deployId
+        FROM
+        bus_sales_order_return_veh_apply
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <select id="selectListAllVo"
+            resultType="com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.BusSalesOrderReturnVehApplyVo">
+        SELECT * FROM bus_sales_order_return_veh_apply
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
 
-	<select id="selectBySid" resultType="int">
-		SELECT COUNT(*)
-		FROM bus_sales_order_return_veh_apply
-		WHERE nodeState != '待提交'
+    <select id="selectBySid" resultType="int">
+        SELECT COUNT(*)
+        FROM bus_sales_order_return_veh_apply
+        WHERE nodeState != '待提交'
 		  and find_in_set(sid, #{list})
     </select>
 
-	<update id="updateFlowFiled">
-		UPDATE bus_sales_order_return_veh_apply
-		SET nodeState=#{nodeState}
-		, nodeSid=#{taskDefKey}
-		<if test="procDefId != null and procDefId != ''">
-			, procDefId=#{procDefId}
-		</if>
-		<if test="procInsId != null and procInsId != ''">
-			, procInstId=#{procInsId}
-		</if>
-		<if test="taskId != null and taskId != ''">
-			, taskId=#{taskId}
-		</if>
-		WHERE sid = #{sid}
-	</update>
+    <update id="updateFlowFiled">
+        UPDATE bus_sales_order_return_veh_apply
+        SET nodeState=#{nodeState}
+        , nodeSid=#{taskDefKey}
+        <if test="procDefId != null and procDefId != ''">
+            , procDefId=#{procDefId}
+        </if>
+        <if test="procInsId != null and procInsId != ''">
+            , procInstId=#{procInsId}
+        </if>
+        <if test="taskId != null and taskId != ''">
+            , taskId=#{taskId}
+        </if>
+        WHERE sid = #{sid}
+    </update>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java

@@ -159,7 +159,7 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
         return p;
     }
 
-    public ResultBean saveOrUpdateDto(BusSalesOrderReturnVehApplyDto dto) {
+    public ResultBean<String> saveOrUpdateDto(BusSalesOrderReturnVehApplyDto dto) {
         ResultBean rb = ResultBean.fireFail();
         String dtoSid = dto.getSid();
         List<BusSalesOrderReturnVehDto> busSalesOrderReturnVehs = dto.getBusSalesOrderReturnVehs();
@@ -174,7 +174,7 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
                 busSalesOrderReturnVeh.setMainSid(mainSid);
                 busSalesOrderReturnVehService.saveOrUpdateDto(busSalesOrderReturnVeh);
             }
-            return rb.success();
+            return rb.success().setData(mainSid);
         }
         BusSalesOrderReturnVehApply busSalesOrderReturnVehApply = fetchBySid(dtoSid);
         if (busSalesOrderReturnVehApply == null) {
@@ -188,7 +188,7 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
             BeanUtil.copyProperties(busSalesOrderReturnVeh, e);
             busSalesOrderReturnVehService.save(e);
         }
-        return rb.success();
+        return rb.success().setData(dtoSid);
     }
 
     public String insertByDto(BusSalesOrderReturnVehApplyDto dto) {
@@ -428,8 +428,14 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
         BusSalesOrderReturnVehApply busSalesOrderReturnVehApply = fetchBySid(businessSid);
         Map<String, Object> variables = new HashMap<>();
         Map<String, Object> appMap = new HashMap<>();
+        Boolean i = false;
+        String saleTypeKey = busSalesOrderReturnVehApply.getSaleTypeKey();
+        if ("2".equals(saleTypeKey)) {
+            i = true;
+        }
         appMap.put("sid", businessSid);
         variables.put("app", appMap);
+        variables.put("isAdj", i);
         bv.setFormVariables(variables);
         bv.setOrgSidPath(busSalesOrderReturnVehApply.getOrgSidPath());
         if (bv.getTaskId().equals(busSalesOrderReturnVehApply.getTaskId())) {
@@ -437,9 +443,13 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
             if (!resultBean.getSuccess()) {
                 return rb.setMsg(resultBean.getMsg());
             }
-            UpdateFlowFieldVo ufVo = resultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
             if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
+                List<BusSalesOrderReturnVehDetailsVo> busSalesOrderReturnVehDetailsVos = busSalesOrderReturnVehService.fetchByMainSid(businessSid);
+                for (BusSalesOrderReturnVehDetailsVo busSalesOrderReturnVehDetailsVo : busSalesOrderReturnVehDetailsVos) {
+                    String vehSid = busSalesOrderReturnVehDetailsVo.getVehSid();
+                    baseVehicleFeign.updateLockedState(vehSid);
+                }
             }
             return rb.success().setData(resultBean.getData());
         } else {