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

新增与修改公出协单新增同步新增协单信息

anderx 1 неделя назад
Родитель
Сommit
a5550051c2

+ 1 - 0
src/main/java/com/goafanti/common/enums/AssistType.java

@@ -2,6 +2,7 @@ package com.goafanti.common.enums;
 
 public enum AssistType {
     //分类 0=其他,1=高企认定,2=会员服务,3=科技项目,4=研动力系统,5=知识产权,6=军工,7=涉密,8=技术合同登记,9=第三方认证项目
+    QT(0,"其他"),
     GQRD(1,"高企认定"),
     HYFW(2,"会员服务"),
     KJXM(3,"科技项目"),

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

@@ -1249,6 +1249,7 @@
         select
         <include refid="PublicReleaseAllSql"/>
         from public_release where aid=#{aid} and status in (0,1,2)
+        and type &lt;5
         and (alone in (0,1) or (alone=2 and assist=2))
         and ( (release_start &gt;= #{start} and release_start &lt;= #{end})
         or  (release_start &lt; #{start} and release_end &gt; #{start})

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

@@ -188,7 +188,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		in.setProcessStatus(1);
 		publicReleaseMapper.insertSelective(in);
 		//如果是非公出协单添加协单信息
-		if (in.getType()==5){
+		if (in.getAssist()==1){
 			addPublicAssistType(in);
 		}
 		if (in.getType()==1&&in.getOrderNo()!=null){
@@ -683,22 +683,20 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 					}
 				}
 				PublicAssistDetails usePd = publicAssistDetailsMapper.selectByPrid(in.getId());
-				//如果是非公出协单添加协单信息
-				if (in.getType()==5){
-					PublicAssistDetails publicAssistDetails = publicAssistDetailsMapper.selectByPrid(in.getId());
-					if (publicAssistDetails==null){
-						//如果是非公出协单添加协单信息
-						addPublicAssistType(in);
-					}else {
-						//如果是非公出协单添加协单信息
-						PublicAssistDetails pad=new PublicAssistDetails();
-						pad.setId(publicAssistDetails.getId());
-						pad.setPrid(in.getId());
-						pad.setType(in.getAssistType());
-						pad.setContentType(in.getAssistContentType());
-						pad.setContent(in.getAssistContent());
-						publicAssistDetailsMapper.update(pad);
-					}
+				//添加协单信息
+				PublicAssistDetails publicAssistDetails = publicAssistDetailsMapper.selectByPrid(in.getId());
+				if (publicAssistDetails==null){
+					//如果是非公出协单添加协单信息
+					addPublicAssistType(in);
+				}else {
+					//如果是非公出协单添加协单信息
+					PublicAssistDetails pad=new PublicAssistDetails();
+					pad.setId(publicAssistDetails.getId());
+					pad.setPrid(in.getId());
+					pad.setType(in.getAssistType());
+					pad.setContentType(in.getAssistContentType());
+					pad.setContent(in.getAssistContent());
+					publicAssistDetailsMapper.update(pad);
 				}
 			}else if (in.getAssist()==0){
 				publicReleaseMapper.updateAssist(in);
@@ -1744,7 +1742,10 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		Map<String, Object> params = new HashMap<>();
 		//把参数放入map中
 		 params.put("startTime", in.getStartTime());
-		 params.put("endTime", in.getEndTime());
+		 if (StringUtils.isNotBlank(in.getEndTime())){
+			 params.put("endTime", in.getEndTime()+" 23:59:59");
+		 }
+
 
 		 params.put("aid", in.getAid());
 		 params.put("assistAid", in.getAssistAid());