功能修改-sjx

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/YieldOrder.java

@@ -481,4 +481,13 @@ public class YieldOrder extends BaseEntity {
 	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Double quota2;
 
+	@TableField(exist = false)
+	private String releaseDateStart;
+
+	@TableField(exist = false)
+	private String releaseDateEnd;
+
+	@TableField(exist = false)
+	private String receiveUserName;
+
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.xml

@@ -17,9 +17,10 @@
 
 
     <select id = "selectPage" resultType = "org.springblade.desk.order.pojo.entity.YieldOrder">
-		SELECT <include refid="baseCommonFields" />
+		SELECT <include refid="baseCommonFields" />,a.real_name as "receiveUserName"
 		FROM MES_YIELD_ORDER yo
-		WHERE IS_DELETED = 0
+		left join blade_user a on yo.receive_user = a.id
+		WHERE yo.IS_DELETED = 0
         <if test = "yieldTypeList != null and yieldTypeList.size() > 0">
             AND YIELD_TYPE IN
             <foreach collection = "yieldTypeList" item = "yieldType" open = "(" separator = "," close = ")">
@@ -55,6 +56,16 @@
         </if>
         <if test = "entity.status != null and entity.status != ''">
             AND status = #{entity.status}
+        </if>
+        <if test = "entity.receiveStatus != null and entity.receiveStatus != ''">
+            AND receive_status = #{entity.receiveStatus}
+        </if>
+
+        <if test = "entity.releaseDateStart != null and entity.releaseDateStart != ''">
+            AND release_date <![CDATA[ >= ]]> to_date(concat(#{entity.releaseDateStart},' 00:00:00'),'YYYY-MM-DD HH24:MI:SS')
+        </if>
+        <if test = "entity.releaseDateEnd != null and entity.releaseDateEnd != ''">
+            AND release_date <![CDATA[ <= ]]> to_date(concat(#{entity.releaseDateStart},' 23:59:59'),'YYYY-MM-DD HH24:MI:SS')
         </if>
 		order by release_date desc
     </select>

blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java

@@ -531,10 +531,13 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 			this.updateById(yieldOrder);
 			return Boolean.FALSE;
 		}
+		yieldOrder.setReceiveTime(new Date());
+		yieldOrder.setReceiveUser(AuthUtil.getUserId());
+		yieldOrder.setReceiveStatus(YieldOrderEnum.RECEIVE_STATUS_YES.getCode());
 		if(yieldOrder.getYieldType() != YieldOrderEnum.YIELD_TYPE_2.getCode()){
 			yieldOrder.setStatus(YieldOrderEnum.STATUS_APS.getCode());
-			this.updateById(yieldOrder);
 		}
+		this.updateById(yieldOrder);
 		return Boolean.TRUE;
 	}
 

blade-service/blade-desk/src/main/java/org/springblade/desk/process/service/impl/FmProjectMilestoneServiceImpl.java

@@ -177,6 +177,7 @@ public class FmProjectMilestoneServiceImpl extends BaseServiceImpl<FmProjectMile
 					}
 					if (isOk) {
 						fmProjectApplication.setProjectEnd(new Date());
+						fmProjectApplication.setApprovalStatus(8L);
 						fmProjectApplicationService.updateById(fmProjectApplication);
 					}
 				}

blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/YieldOrderMapper.xml

@@ -67,7 +67,6 @@
             </if>
             <if test="yieldOrder.batchNo != null and yieldOrder.batchNo != ''">
                 and batch_no LIKE CONCAT('%', CONCAT(#{yieldOrder.batchNo}, '%'))
-
             </if>
             <if test="yieldOrder.yoCode != null and yieldOrder.yoCode != ''">
                 and yo_code LIKE CONCAT('%', CONCAT(#{yieldOrder.yoCode}, '%'))
@@ -87,6 +86,9 @@
             <if test="yieldOrder.workCenterId != null">
                 and work_center_id = #{yieldOrder.workCenterId}
             </if>
+            <if test="yieldOrder.cardNo != null and yieldOrder.cardNo != ''">
+                and card_no LIKE CONCAT('%', CONCAT(#{yieldOrder.cardNo}, '%'))
+            </if>
         order by receive_time desc
         </where>
     </select>