Просмотр исходного кода

变更审核人员通知修改

anderx лет назад: 3
Родитель
Сommit
88006ff2af

+ 7 - 7
src/main/java/com/goafanti/common/mapper/OrderChangeLogMapper.xml

@@ -116,7 +116,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Fri Aug 16 14:22:36 CST 2019.
       This element was generated on Fri Aug 16 14:22:36 CST 2019.
     -->
     -->
-    select 
+    select
     <include refid="Base_Column_List" />
     <include refid="Base_Column_List" />
     from order_change_log
     from order_change_log
     where id = #{id,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
@@ -147,11 +147,11 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Fri Aug 16 14:22:36 CST 2019.
       This element was generated on Fri Aug 16 14:22:36 CST 2019.
     -->
     -->
-    insert into order_change_log (id, change_id, order_no, 
-      status, create_time, remarks, 
+    insert into order_change_log (id, change_id, order_no,
+      status, create_time, remarks,
       auditor)
       auditor)
-    values (#{id,jdbcType=INTEGER}, #{changeId,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR}, 
-      #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{remarks,jdbcType=VARCHAR}, 
+    values (#{id,jdbcType=INTEGER}, #{changeId,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR},
+      #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{remarks,jdbcType=VARCHAR},
       #{auditor,jdbcType=VARCHAR})
       #{auditor,jdbcType=VARCHAR})
   </insert>
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.OrderChangeLog">
   <insert id="insertSelective" parameterType="com.goafanti.common.model.OrderChangeLog">
@@ -316,10 +316,10 @@
     where id = #{id,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
   </update>
   <select id="selectOrderChangeLogList" resultType="com.goafanti.order.bo.OrderChangeLogBo">
   <select id="selectOrderChangeLogList" resultType="com.goafanti.order.bo.OrderChangeLogBo">
-  select a.id,a.change_id changeId,a.order_no orderNo,a.status,a.remarks,a.auditor,a.create_time createTime,
+  select  a.id,a.change_id changeId,a.order_no orderNo,a.status,a.remarks,a.auditor,a.create_time createTime,
 		date_format(a.create_time,'%Y-%m-%d %H:%i:%S')createTimes ,b.name aname
 		date_format(a.create_time,'%Y-%m-%d %H:%i:%S')createTimes ,b.name aname
 		from order_change_log a left join admin b on a.auditor=b.id
 		from order_change_log a left join admin b on a.auditor=b.id
 		where a.change_id= #{changeId}
 		where a.change_id= #{changeId}
 		order by a.create_time
 		order by a.create_time
   </select>
   </select>
-</mapper>
+</mapper>

+ 3 - 2
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -267,6 +267,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 					}else if(nb.getProcessState()==5){
 					}else if(nb.getProcessState()==5){
 						nb.setStatus(4);
 						nb.setStatus(4);
 						pushCompleteOrderChange(nb);
 						pushCompleteOrderChange(nb);
+						return 1;
 					}
 					}
 				}else {
 				}else {
 					if (nb.getChangeAmount().compareTo(new BigDecimal("0.2"))<0) {//小于则总裁通过,大于则董事长
 					if (nb.getChangeAmount().compareTo(new BigDecimal("0.2"))<0) {//小于则总裁通过,大于则董事长
@@ -666,7 +667,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 	}
 	}
 
 
 	/**
 	/**
-	 * 获取除发起者意外所有审核者
+	 * 获取除当前审核者所有审核者
 	 * @param id
 	 * @param id
 	 * @return
 	 * @return
 	 */
 	 */
@@ -675,7 +676,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		List<String>newl=new ArrayList<>();
 		List<String>newl=new ArrayList<>();
 		List<OrderChangeLogBo>  list=orderChangeLogMapper.selectOrderChangeLogList(id.toString());
 		List<OrderChangeLogBo>  list=orderChangeLogMapper.selectOrderChangeLogList(id.toString());
 		for (OrderChangeLogBo log : list) {
 		for (OrderChangeLogBo log : list) {
-			if (!log.getStatus().equals(0)){
+			if (!TokenManager.getAdminId().equals(log.getAuditor())){
 				if (!newl.contains(log.getAuditor())){
 				if (!newl.contains(log.getAuditor())){
 					newl.add(log.getAuditor());
 					newl.add(log.getAuditor());
 				}
 				}