Browse Source

取消公出协单BUG修复

anderx 1 year ago
parent
commit
64fbbb64bf

+ 2 - 0
src/main/java/com/goafanti/common/dao/PublicReleaseMapper.java

@@ -141,5 +141,7 @@ public interface PublicReleaseMapper {
     List<PublicRelease> selectByMainIdAndReviewer(@Param("id") Integer id, @Param("reviewerId") String reviewerId);
 
     List<PublicReleaseDetails> selectDetailsByPrid(Integer prid);
+
+    void updateAssist(InputPublicRelease in);
 }
 

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

@@ -1020,6 +1020,10 @@
             and aid= #{aid}
         </if>
     </update>
+    <update id="updateAssist">
+        update public_release set assist_aid=null,assist_aid_name=null
+        where id= #{id}
+    </update>
 
     <select id="selectCountByaidAndDate" resultType="java.lang.Integer">
         select ifnull(count(*),0)publicReleaseCount

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

@@ -462,6 +462,8 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 			}
 			if (in.getAssist()==1){
 				in.setAssistProcess(1);
+			}else if (in.getAssist()==0){
+				publicReleaseMapper.updateAssist(in);
 			}
 			if (in.getUids()!=null){
 				List<String> split = Arrays.asList(in.getUids().split(","));
@@ -486,8 +488,6 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 			List<PublicRelease> list = publicReleaseMapper.selectByMainId(in.getId(),3,null);
 			String[] split = in.getAssistAid().split(",");
 			if (split.length==0){
-				in.setAssistAid("");
-				in.setAssistAidName("");
 				for (PublicRelease e : list) {
 					if (e.getClockIn()==1){
 						throw new BusinessException("协单打卡不能删除");