Quellcode durchsuchen

发起公出逻辑修改,技术公出审核逻辑判定加入

anderx vor 1 Jahr
Ursprung
Commit
3a40cea859

+ 14 - 0
src/main/java/com/goafanti/common/mapper/PublicReleaseMapper.xml

@@ -377,6 +377,9 @@
             left join public_release_details b on a.id=b.prid
             left join user e on b.uid=e.id
         </if>
+        <if test="type==5">
+            left join t_order_new ton on a.order_no =ton.order_no
+        </if>
         where 1=1
         <if test="type==0">
             and a.public_type in (0,1,2,3)
@@ -425,6 +428,10 @@
             and e.aid = #{aid}
             and a.public_type in (1,2)
         </if>
+        <if test="type==5">
+            and a.tech_start_process=1
+            and ton.salesman_id =#{aid}
+        </if>
         <if test="clockIn !=null">
             and a.clock_in =#{clockIn}
         </if>
@@ -462,6 +469,9 @@
             left join public_release_details b on a.id=b.prid
             left join user e on b.uid=e.id
         </if>
+        <if test="type==5">
+            left join t_order_new ton on a.order_no =ton.order_no
+        </if>
         where 1=1
         <if test="type==0">
             and a.public_type in (0,1,2,3)
@@ -510,6 +520,10 @@
             and e.aid = #{aid}
             and a.public_type in (1,2)
         </if>
+        <if test="type==5">
+            and a.tech_start_process=1
+            and ton.salesman_id =#{aid}
+        </if>
         <if test="userName !=null">
             and e.nickname like concat('%',#{userName},'%')
         </if>

+ 1 - 1
src/main/java/com/goafanti/weChat/bo/InputPublicReleaseList.java

@@ -4,7 +4,7 @@ public class InputPublicReleaseList {
 
 	private Integer pageSize;
 	private Integer pageNo;
-//	查看类型 0我的公出 1公出审核 2管理员 3协单(技术财税总监看全部) 4 公出企业负责人审核
+//	查看类型 0我的公出 1公出审核 2管理员 3协单(技术财税总监看全部) 4 公出企业负责人审核 5 技术公出审核
 	private Integer type;
 	private String clockTime;
 	/**

+ 2 - 1
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -1544,7 +1544,8 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		BigDecimal count = BigDecimal.ZERO;
 		count=count.add(BigDecimal.valueOf(in.getDuration()));
 		List<String> peopleList = new ArrayList<>();
-		int timesCount=0;
+		peopleList.add(in.getAid());
+		int timesCount=1;
 		for (PublicRelease e : list) {
 			if (e.getDuration()!=null){
 				count=count.add(BigDecimal.valueOf(e.getDuration()));