Browse Source

修改公出业务切技术BUG修复

anderx 2 years ago
parent
commit
110b70c941

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

@@ -24,4 +24,6 @@ public interface PublicExamineMapper {
 
 
     List<PublicExamine> selectByIds(@Param("ids") List<Integer> ids);
+
+    void deletePrid(Integer id);
 }

+ 5 - 0
src/main/java/com/goafanti/common/mapper/PublicExamineMapper.xml

@@ -22,6 +22,7 @@
     delete from public_examine
     where id = #{id,jdbcType=INTEGER}
   </delete>
+
   <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.PublicExamine" useGeneratedKeys="true">
     insert into public_examine (prid, aid, `status`,
       create_time, aname)
@@ -120,4 +121,8 @@
       #{id}
     </foreach>
   </select>
+  <delete id="deletePrid">
+    delete from public_examine
+    where prid = #{id,jdbcType=INTEGER}
+  </delete>
 </mapper>

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

@@ -325,7 +325,14 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 			in.setStatus(1);
 			log.setStatus(PublicReleaseLog.states.xg.getCode());
 			in.setUpdateStatus(1);
-			if(use.getPublicType()==2||use.getPublicType()==3){
+			//如果是业务切公出则撤销营销审核与审核人
+			if(in.getType()==1&&use.getType()==0){
+				in.setPublicType(0);
+				publicExamineMapper.deletePrid(in.getId());
+
+			}
+			//如果是业务公出,切审核状态为其他,则重置审核
+			if(in.getType()==0&&(use.getPublicType()==2||use.getPublicType()==3)){
 				in.setPublicType(1);
 				PublicExamine pe=new PublicExamine();
 				pe.setPrid(in.getId());
@@ -333,7 +340,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 				publicExamineMapper.updatePrid(pe);
 			}
 			AdminListBo my = adminMapper.getDeptNameByAid(TokenManager.getAdminId());
-			//新增修改日志
+
 			//重新发起
 			addPublicReleaseLog(my,in,in.getUserNames(),date,uses);
 		}else {