Browse Source

Merge branch 'test' of jishutao/kede-server into prod

anderx 1 year ago
parent
commit
61cfcd7d47

+ 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

+ 5 - 0
src/main/java/com/goafanti/customer/service/impl/UserArchivesServiceImpl.java

@@ -69,7 +69,12 @@ public class UserArchivesServiceImpl extends BaseMybatisDao< UserArchivesMapper>
         if (!customerContacts.isEmpty()){
             List<OrganizationContactBook> collect = customerContacts.stream()
                     .filter(e -> e.getMajor() == 1).collect(Collectors.toList());
+            for (OrganizationContactBook ob : collect) {
+                ob.setName("***");
+                ob.setMobile("***");
+            }
             user.setContactList(collect);
+
         }
         BeanUtils.copyProperties(userArchives, user);
         return user;

+ 0 - 4
src/main/java/com/goafanti/weChat/controller/AdminReleaseApiController.java

@@ -243,10 +243,6 @@ public class AdminReleaseApiController extends CertifyApiController{
 
 	/**
 	 * 技术公出审核 公出他人企业
-	 * @param id
-	 * @param status
-	 * @param remarks
-	 * @return
 	 */
 	@RequestMapping(value = "/techExamine", method = RequestMethod.POST)
 	public Result techExamine(Integer id ,Integer status,String remarks){

+ 19 - 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(","));
@@ -482,9 +484,21 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 				pe.setStatus(0);
 				publicExamineMapper.updateByPridSelective(pe);
 			}
-//			//处理协单
-//			List<PublicRelease> list = publicReleaseMapper.selectByMainId(in.getId(),3,null);
+			//处理协单,修改,正常不存在协单,反想操作有协单需要单独处理
+			List<PublicRelease> list = publicReleaseMapper.selectByMainId(in.getId(),3,null);
+			String[] split = in.getAssistAid().split(",");
+			if (split.length==0){
+				for (PublicRelease e : list) {
+					if (e.getClockIn()==1){
+						throw new BusinessException("协单打卡不能删除");
+					}
+				}
+				for (PublicRelease e : list) {
+					publicReleaseMapper.deleteById(e.getId());
+				}
+			}
 //			List<PublicRelease> list2 = publicReleaseMapper.selectByMainId(in.getId(),4,null);
+
 //			for (PublicRelease out : list) {
 //				addpublicLog(out.getId(), PublicReleaseLog.states.xg.getCode(), "修改公出信息,协单自动更改状态");
 //				out.setStatus(1);
@@ -532,6 +546,8 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		return 1;
 	}
 
+
+
 	private void pushUpdateType(InputPublicRelease in, PublicRelease use) {
 		//营销切换成技术
 		if(use.getType()==0&&in.getType()==1){
@@ -558,6 +574,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 	private void deletePRD(List<String> split, List<OutPublicReleaseDetails> prdList) {
 		for (OutPublicReleaseDetails prd : prdList) {
 			boolean flag=true;
+
 			for (String s : split) {
 				if (prd.getUid().equals(s)){
 					flag=false;