采购单申请流程调整

yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyMapper.xml

@@ -13,7 +13,10 @@
 
 	<update id="updateFlowFiled">
 		UPDATE as_arrearsout_apply
-		SET nodeState=#{nodeState}, nodeId=#{taskDefKey}, finishTime = NOW()
+		SET nodeState=#{nodeState}, nodeId=#{taskDefKey}
+		<if test="nodeState == '已办结' or nodeState == '终止'">
+			, finishTime = NOW()
+		</if>
 		<if test="procDefId != null and procDefId != ''">
 			, procDefId=#{procDefId}
 		</if>

yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandleapply/AsOldparthandleApplyMapper.xml

@@ -20,7 +20,10 @@
 
 	<update id="updateFlowFiled">
 		UPDATE as_oldparthandle_apply
-		SET nodeState=#{nodeState}, nodeId=#{taskDefKey}, finishTime = NOW()
+		SET nodeState=#{nodeState}, nodeId=#{taskDefKey}
+		<if test="nodeState == '已办结' or nodeState == '终止'">
+			, finishTime = NOW()
+		</if>
 		<if test="procDefId != null and procDefId != ''">
 			, procDefId=#{procDefId}
 		</if>

yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyMapper.xml

@@ -31,7 +31,10 @@
 
 	<update id="updateFlowFiled">
 		UPDATE as_oldpartreturn_apply
-		SET nodeState=#{nodeState}, nodeId=#{taskDefKey}, finishTime = NOW()
+		SET nodeState=#{nodeState}, nodeId=#{taskDefKey}
+		<if test="nodeState == '已办结' or nodeState == '终止'">
+			, finishTime = NOW()
+		</if>
 		<if test="procDefId != null and procDefId != ''">
 			, procDefId=#{procDefId}
 		</if>

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillDetailsVo.java

@@ -110,7 +110,7 @@ public class PmsPurchaseBillDetailsVo implements Vo {
     private String purchaserName;
     @ApiModelProperty("预计到货日期")
     @JsonFormat(
-            pattern = "yyyy-MM-dd",
+            pattern = "yyyy-MM-dd HH:mm:ss",
             timezone = "GMT+8"
     )
     private Date deliveryDate;
@@ -140,7 +140,7 @@ public class PmsPurchaseBillDetailsVo implements Vo {
     private String nodeState; // 流程状态
     @ApiModelProperty("任务id")
     private String taskId; // 任务id
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     @ApiModelProperty("办结时间")
     private Date finishTime; // 办结时间
 

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillMapper.xml

@@ -18,7 +18,9 @@
 		ppb.`supplierName`,
 		IF(ppbi.`isInvoicing` = 1, '是','否') AS isInvoicing,
 		SUM(ppbd.`amount`) AS amountCount,
-		ppb.`payableAmount`
+		ppb.`payableAmount`,
+		ppb.procDefId,
+		ppb.procInstId
 		FROM
 		pms_purchase_bill ppb
 		LEFT JOIN pms_purchase_bill_invoice ppbi
@@ -38,7 +40,10 @@
 
 	<update id="updateFlowFiled">
 		UPDATE pms_purchase_bill
-		SET nodeState=#{nodeState}, nodeId=#{taskDefKey}, finishTime = NOW()
+		SET nodeState=#{nodeState}, nodeId=#{taskDefKey}
+		<if test="nodeState == '已办结' or nodeState == '终止'">
+			, finishTime = NOW()
+		</if>
 		<if test="procDefId != null and procDefId != ''">
 			, procDefId=#{procDefId}
 		</if>

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillService.java

@@ -26,6 +26,7 @@
 package com.yxt.pms.biz.pms.pmspurchasebill;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillVo.java

@@ -83,4 +83,8 @@ public class PmsPurchaseBillVo implements Vo {
     private BigDecimal amountCount;
     @ApiModelProperty("应付金额（=采购金额+运费-优惠金额）")
     private BigDecimal payableAmount;
+    @ApiModelProperty("流程定义的id")
+    private String procDefId;
+    @ApiModelProperty("流程实例的sid")
+    private String procInstId;
 }

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailService.java

@@ -64,12 +64,7 @@ public class PmsPurchaseBillDetailService extends MybatisBaseService<PmsPurchase
     }
 
     public void saveOrUpdateDto(PmsPurchaseBillDetailDto dto) {
-        String dtoSid = dto.getSid();
-        if (StringUtils.isBlank(dtoSid)) {
         this.insertByDto(dto);
-            return; 
-        } 
-		this.updateByDto(dto);
     }
 
     public void insertByDto(PmsPurchaseBillDetailDto dto) {
@@ -78,16 +73,6 @@ public class PmsPurchaseBillDetailService extends MybatisBaseService<PmsPurchase
         baseMapper.insert(entity);
     }
 
-	public void updateByDto(PmsPurchaseBillDetailDto dto){
-          String dtoSid = dto.getSid();
-        if (StringUtils.isBlank(dtoSid)) {
-            return;
-        } 
-		PmsPurchaseBillDetail entity = fetchBySid(dtoSid);
-		BeanUtil.copyProperties(dto, entity, "id", "sid");
-		baseMapper.updateById(entity);
-	}
-	
     public PmsPurchaseBillDetailDetailsVo fetchDetailsVoBySid(String sid) {
         PmsPurchaseBillDetail entity = fetchBySid(sid);
         PmsPurchaseBillDetailDetailsVo vo = new PmsPurchaseBillDetailDetailsVo();

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceService.java

@@ -52,6 +52,7 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class PmsPurchaseBillInvoiceService extends MybatisBaseService<PmsPurchaseBillInvoiceMapper, PmsPurchaseBillInvoice> {
+
 	private QueryWrapper<PmsPurchaseBillInvoice> createQueryWrapper(PmsPurchaseBillInvoiceQuery query) {
 		// todo: 这里根据具体业务调整查询条件
 		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
@@ -69,12 +70,7 @@ public class PmsPurchaseBillInvoiceService extends MybatisBaseService<PmsPurchas
 	}
 	
 	public void saveOrUpdateDto(PmsPurchaseBillInvoiceDto dto){
-        String dtoSid = dto.getSid();
-        if (StringUtils.isBlank(dtoSid)) {
 		this.insertByDto(dto);
-            return; 
-        } 
-		this.updateByDto(dto);
 	}
 	
 	public void insertByDto(PmsPurchaseBillInvoiceDto dto){
@@ -83,16 +79,6 @@ public class PmsPurchaseBillInvoiceService extends MybatisBaseService<PmsPurchas
 		baseMapper.insert(entity);
 	}
 
-	public void updateByDto(PmsPurchaseBillInvoiceDto dto){
-          String dtoSid = dto.getSid();
-        if (StringUtils.isBlank(dtoSid)) {
-            return;
-        } 
-		PmsPurchaseBillInvoice entity = fetchBySid(dtoSid);
-		BeanUtil.copyProperties(dto, entity, "id", "sid");
-		baseMapper.updateById(entity);
-	}
-	
 	public PmsPurchaseBillInvoiceDetailsVo fetchDetailsVoBySid(String sid){
 		PmsPurchaseBillInvoice entity = fetchBySid(sid);
 		PmsPurchaseBillInvoiceDetailsVo vo = new PmsPurchaseBillInvoiceDetailsVo();