审批放行查询

src/main/java/com/xujie/modules/part/service/Impl/PartServiceImpl.java

@@ -125,7 +125,7 @@ public class PartServiceImpl extends ServiceImpl<PartMapper, Part> implements IP
         //流程审批
         erfFlowInstanceService.approveNodeInstance(nodeInstanceData, username);
         //判断是否最后一个节点，修改产品类型为已审批
-        ErfFlowNodeData flowNodeData = erfFlowInstanceMapper.getFlowNodeData(nodeInstanceData.getNodeCode());
+        ErfFlowNodeData flowNodeData = erfFlowInstanceMapper.getFlowNodeData(nodeInstanceData.getNodeCode(),data.getSite());
         if (flowNodeData == null || "END".equals(flowNodeData.getNodeType()) || Objects.equals(data.getSpecialRelease(), "Y")) {
             Part part = new Part();
             part.setId(data.getId());

src/main/java/com/xujie/modules/part/vo/PartVo.java

@@ -86,6 +86,16 @@ public class PartVo extends QueryPage {
     @ApiModelProperty(value = "产品阶段（新品Created，正式下单Approved）")
     private String partStage;
 
+    @ApiModelProperty(value = "开始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date startDate;
+
+    @ApiModelProperty(value = "结束日期")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date endDate;
+
 
     /**
      * 流程实例
@@ -115,6 +125,18 @@ public class PartVo extends QueryPage {
     @ApiModelProperty(value = "状态")
     private String action;
 
+    @ApiModelProperty(value = "部门id")
+    private String departmentId;
+
+    @ApiModelProperty(value = "部门名称")
+    private String departmentName;
+
+    @ApiModelProperty(value = "审批人")
+    private String assigneeName;
+
+    @ApiModelProperty(value = "审批人id")
+    private Long assigneeUserId;
+
     public Object getKey() {
         return this.id;
     }

src/main/java/com/xujie/modules/workFlow/mapper/ErfFlowInstanceMapper.java

@@ -110,5 +110,5 @@ public interface ErfFlowInstanceMapper extends BaseMapper<ErfFlowInstance> {
     /**
      * 查询流程节点数据
      */
-    ErfFlowNodeData getFlowNodeData(@Param("nodeCode") String nodeCode);
+    ErfFlowNodeData getFlowNodeData(@Param("nodeCode") String nodeCode,@Param("site") String site);
 }

src/main/resources/mapper/part/mapperXml/PartMapper.xml

@@ -101,6 +101,8 @@
         ni.special_release,
         ni.department_id,
         ni.department_name,
+        i.status as flowStatus,
+        p.part_stage,
         p.part_no,
         p.part_desc,
         p.remark,
@@ -149,7 +151,15 @@
         <if test="query.applyNo != null and query.applyNo != ''"> and i.apply_no like '%${query.applyNo}%'</if>
         <if test="query.nodeCode != null and query.nodeCode != ''"> and ni.node_code = '${query.nodeCode}'</if>
         <if test="query.specialRelease != null and query.specialRelease != ''"> and ni.special_release = '${query.specialRelease}'</if>
+        <!--    112 样式码表示 yyyyMMdd 格式-->
+        <if test="query.startDate != null ">
+            AND CONVERT(varchar(8), ni.receive_time, 112) &gt;= #{query.startDate}
+        </if>
+        <if test="query.endDate != null ">
+            AND CONVERT(varchar(8), ni.receive_time, 112) &lt;= #{query.endDate}
+        </if>
     order by p.id desc
     </select>
 
+
 </mapper>