采购订单分页列表查询排查结果 sql语句查询不正确，已更正

采购订单表缺少订单类型key字段，需要补充字段以及查询条件、保存、修改、编辑回显
外采提交流程添加taskId字段。

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplication.java

@@ -97,7 +97,8 @@ public class BaseOutsourcingApplication extends BaseEntity {
 
     @ApiModelProperty(value = "节点状态")
     private String nodeState;
-
+    @ApiModelProperty("任务id")
+    private String taskId;
     @ApiModelProperty("分公司sid")
     private String useOrgSid; // 分公司sid
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDto.java

@@ -104,6 +104,8 @@ public class BaseOutsourcingApplicationDto implements Dto {
 
 	@ApiModelProperty(value = "节点状态")
 	private String nodeState;
+	@ApiModelProperty("任务id")
+	private String taskId;
 
 	@ApiModelProperty("分公司sid")
 	private String useOrgSid; // 分公司sid

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationVo.java

@@ -65,4 +65,5 @@ public class BaseOutsourcingApplicationVo implements Vo {
     private String guidedPrice; // 销售指导价
 	@ApiModelProperty("节点状态")
     private String nodeState; // 节点状态
+
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrder.java

@@ -56,7 +56,10 @@ public class BusVehicleOrder extends BaseEntity {
     
 	@ApiModelProperty("订单编号")
     private String orderNo; // 订单编号
-    
+
+    @ApiModelProperty("订单类型key")
+    private String orderTypeKey; // 订单类型key
+
 	@ApiModelProperty("订单类型")
     private String orderType; // 订单类型
     

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderDto.java

@@ -62,13 +62,16 @@ public class BusVehicleOrderDto implements Dto {
 
 	@ApiModelProperty("业务员sid")
 	private String staffSid;
-    
+
 	@ApiModelProperty("创建组织sid")
     private String createOrgSid; // 创建组织sid
     
 	@ApiModelProperty("订单编号")
     private String orderNo; // 订单编号
-    
+
+	@ApiModelProperty("订单类型key")
+	private String orderTypeKey; // 订单类型key
+
 	@ApiModelProperty("订单类型")
 	@NotBlank(message = "订单类型不能为空")
     private String orderType; // 订单类型

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderQuery.java

@@ -60,8 +60,8 @@ public class BusVehicleOrderQuery implements Query {
 	@ApiModelProperty("订单编号")
     private String orderNo;
 
-    @ApiModelProperty("订单类型")
+    @ApiModelProperty("订单类型key")
-    private String orderType;
+    private String orderTypeKey;
 
     @ApiModelProperty("订单状态")
     private String orderStatus;

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderVo.java

@@ -48,6 +48,8 @@ import lombok.Data;
 @Data
 public class BusVehicleOrderVo implements Vo {
 
+    @ApiModelProperty("采购订单sid")
+    private String sid; // 采购订单sid
     
 	@ApiModelProperty("创建组织sid")
     private String createOrgSid; // 创建组织sid
@@ -57,8 +59,11 @@ public class BusVehicleOrderVo implements Vo {
     
 	@ApiModelProperty("订单编号")
     private String orderNo; // 订单编号
-    
+
-	@ApiModelProperty("订单类型")
+    @ApiModelProperty("订单类型key")
+    private String orderTypeKey; // 订单类型key
+
+    @ApiModelProperty("订单类型")
     private String orderType; // 订单类型
     
 	@ApiModelProperty("订单日期")

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationMapper.xml

@@ -29,6 +29,9 @@
 		<if test="procInsId != null and procInsId != ''">
 			, procInstSid=#{procInsId}
 		</if>
+		<if test="taskId != null and taskId != ''">
+			, taskId=#{taskId}
+		</if>
 		WHERE sid=#{sid}
     </update>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java

@@ -298,6 +298,7 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
 				paramMap.put("nodeState", map.get("nodeState"));
 				paramMap.put("procInsId", map.get("procInsId"));
 				paramMap.put("taskDefKey", map.get("taskDefKey"));
+				paramMap.put("taskId", map.get("taskId"));
 				updateFlowFiled(paramMap);
 			}
 			return resultBean1;

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderMapper.xml

@@ -162,10 +162,13 @@
 
     <select id="selectBySid" resultType="com.yxt.anrui.base.api.busvehicleorder.BusVehicleOrderVo">
         SELECT bvo.createOrgSid,
+               bvo.sid,
                bvo.orderNo,
                bvo.orderType,
+               bvo.orderTypeKey,
                bvo.orderDate,
                bvo.purchaseApplyMediumModelSid,
+               bvo.purchaseRequisitionSid,
                bvo.platformNo,
                bvo.coatPrice,
                bvo.treasuryPrice,
@@ -179,9 +182,8 @@
                bva.applicationCode,
                bvo.remarks
         FROM bus_vehicle_order bvo
-                 LEFT JOIN base_vehicle_model bvm ON bvo.purchaseApplyMediumModelSid = bvm.sid
+                     LEFT JOIN base_vehicle_model bvm ON bvo.purchaseApplyMediumModelSid = bvm.sid
-                 LEFT JOIN bus_vehicle_apply_detail bvad ON bvo.purchaseApplyMediumModelSid = bvad.sid
+                     LEFT JOIN bus_vehicle_apply bva ON bvo.purchaseRequisitionSid = bva.sid
-                 LEFT JOIN bus_vehicle_apply bva ON bvad.applySid = bva.sid
         WHERE bvo.sid = #{sid}
     </select>
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java

@@ -104,14 +104,14 @@ public class BusVehicleOrderService extends MybatisBaseService<BusVehicleOrderMa
     private QueryWrapper<BusVehicleOrder> createQueryWrapper(BusVehicleOrderQuery query) {
         // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
         QueryWrapper<BusVehicleOrder> qw = new QueryWrapper<>();
-        qw.eq("createBySid",query.getUserSid());
+        qw.eq("bvo.createBySid",query.getUserSid());
-        qw.eq("useOrg",query.getUseOrgSid());
+        qw.eq("bvo.useOrg",query.getUseOrgSid());
         if (StringUtils.isNotBlank(query.getOrderNo())) {
             qw.like("bvo.orderNo", query.getOrderNo());
         }
 
-        if (StringUtils.isNotBlank(query.getOrderType())) {
+        if (StringUtils.isNotBlank(query.getOrderTypeKey())) {
-            qw.like("bvo.orderType", query.getOrderType());
+            qw.like("bvo.orderTypeKey", query.getOrderTypeKey());
         }
 
         if (StringUtils.isNotBlank(query.getOrderStatus())) {

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/flow/FlowableService.java

@@ -56,11 +56,13 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
         List<LatestTaskVo> list = flowTaskFeign.getLatestTasks(procId).getData();
         String nodeState = list.get(0).getName_();
         String task_def_key_ = list.get(0).getTask_def_key_();
+        String taskId = list.get(0).getId_();
         Map<String, String> map = new HashMap<>();
         map.put("sid", variables.get("businessSid").toString());
         map.put("nodeState", nodeState);
         map.put("procInsId", rb.getData().getProcInsId());
         map.put("taskDefKey", task_def_key_);
+        map.put("taskId",taskId);
         return new ResultBean().success().setData(map);
     }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java

@@ -170,9 +170,11 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                 SysOrganizationVo data1 = sysOrganizationVoResultBean.getData();
                 Integer isDept = data1.getIsDept();
                 String psid = data1.getPsid();
-                if (isDept == 0 && !psid.equals(0)) {
+                if (isDept != null) {
-                    orgSidPath = s;
+                    if (isDept == 0 && !psid.equals(0)) {
-                    break;
+                        orgSidPath = s;
+                        break;
+                    }
                 }
             }
         }
@@ -302,7 +304,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             finBillFile.setCreateByName(commonAppendixDto.getName());
             ResultBean<CommonAppendixVo> commonAppendixVoResultBean = commonAppendixFeign.fetchByFilePath(filePath);
             CommonAppendixVo data = commonAppendixVoResultBean.getData();
-            if (data == null){
+            if (data == null) {
                 return rb.setMsg("请上传相关附件");
             }
             String sid1 = data.getSid();
@@ -327,7 +329,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             finBillFile.setCreateByName(commonAppendixDto.getName());
             ResultBean<CommonAppendixVo> commonAppendixVoResultBean = commonAppendixFeign.fetchByFilePath(filePath);
             CommonAppendixVo data = commonAppendixVoResultBean.getData();
-            if (data == null){
+            if (data == null) {
                 return rb.setMsg("请上传相关附件");
             }
             String sid1 = data.getSid();
@@ -352,7 +354,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             finBillFile.setCreateByName(commonAppendixDto.getName());
             ResultBean<CommonAppendixVo> commonAppendixVoResultBean = commonAppendixFeign.fetchByFilePath(filePath);
             CommonAppendixVo data = commonAppendixVoResultBean.getData();
-            if (data == null){
+            if (data == null) {
                 return rb.setMsg("请上传相关附件");
             }
             String sid1 = data.getSid();
@@ -405,9 +407,9 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         ResultBean<BusSalesOrderDetailsVo> busSalesOrderDetailsVoResultBean = busSalesOrderFeign.fetchDetailsBySid(busSid);
         BusSalesOrderDetailsVo data1 = busSalesOrderDetailsVoResultBean.getData();
         String oneBillMoney = data1.getOneBillMoney();
-        if (StringUtils.isBlank(oneBillMoney)){
+        if (StringUtils.isBlank(oneBillMoney)) {
             vo.setOneBillState("0");
-        }else {
+        } else {
             vo.setOneBillMoney(oneBillMoney);
             vo.setOneBillState("1");
         }
@@ -453,9 +455,9 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         ResultBean<String> priceByOrderSid = busSalesOrderPriceFeign.getPriceByOrderSid(busSid);
         String price = priceByOrderSid.getData();
         if (price.equals(oneBillMoney)) {
-            variables.put("isHighAndLowOpen",false);
+            variables.put("isHighAndLowOpen", false);
         } else {
-            variables.put("isHighAndLowOpen",true);
+            variables.put("isHighAndLowOpen", true);
         }
         if (StringUtils.isBlank(dto.getTaskId())) { // 新提交
             String proDefId = ProcDefEnum.SEALAPPLY.getProDefId();
@@ -557,7 +559,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                 ResultBean<CommonContractVo> commonContractVoResultBean = commonContractFeign.fetchBySid(sid1);
                 CommonContractVo data = commonContractVoResultBean.getData();
                 String orderSid = data.getBusSid();
-                busSalesOrderFeign.updateOneBillMoneyByOrderSid(orderSid,oneBillMoney);
+                busSalesOrderFeign.updateOneBillMoneyByOrderSid(orderSid, oneBillMoney);
             }
         }
         paramMap.put("nodeState", nodeState);