Explorar el Código

公出列表协单意见数判定修改。

anderx hace 1 año
padre
commit
c757faf007

+ 6 - 0
src/main/java/com/goafanti/common/dao/PublicAssistAdviceMapper.java

@@ -82,6 +82,12 @@ public interface PublicAssistAdviceMapper {
      */
     int deleteById(Integer id);
 
+    /**
+     * 通过主键查询数据
+     * @param id 公出编号
+     * @param type 0 协单的公出意见 1 业务公出的协单意见
+     * @return
+     */
     List<PublicAssistAdvice> selectList(@Param("id") Integer id, @Param("type") Integer type);
 }
 

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

@@ -151,7 +151,7 @@ public class AdminReleaseApiController extends CertifyApiController{
 	}
 
 	/**
-	 * 外出申请列表.公出列表,我的协单列表,协单审核
+	 * 外出申请列表.公出列表,我的协单列表,协单审核
 	 */
 	@RequestMapping(value = "/listPublicRelease", method = RequestMethod.GET)
 	public Result listPublicRelease(InputPublicReleaseList in){

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

@@ -710,8 +710,9 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 			List<PublicExamine> publicExamines = publicExamineMapper.selectByIds(ids);
 			for (OutPublicReleaseList e : list) {
 				if (e.getStatus()==1){
-					List<AdminPublicReviewerBo> adminPublicReviewerBos = adminPublicReviewerMapper.selectByAid(e.getAid());
+					List<AdminPublicReviewerBo> adminPublicReviewerBos=null;
 					if (e.getType()==3){
+						adminPublicReviewerBos= adminPublicReviewerMapper.selectByAid(e.getAid());
 						StringBuffer str =new StringBuffer();
 						for (AdminPublicReviewerBo ap : adminPublicReviewerBos) {
 							if(ap.getType()==1)str=str.append(ap.getReviewerName()+",");
@@ -722,6 +723,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 						if (((e.getPublicType()==0||e.getPublicType()==2)
 								&&(e.getTechStartProcess()==0||e.getTechStartProcess()==2))){
 							StringBuffer str =new StringBuffer();
+							adminPublicReviewerBos= adminPublicReviewerMapper.selectByAid(e.getAid());
 							for (AdminPublicReviewerBo ap : adminPublicReviewerBos) {
 								if(ap.getType()==0)str=str.append(ap.getReviewerName()+",");
 							}
@@ -747,13 +749,26 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 
 					}
 				}
-				List<PublicAssistAdvice> publicAssistAdvices = publicAssistAdviceMapper.selectList(e.getId(), 0);
-				if (publicAssistAdvices.isEmpty()){
-					e.setPublicAssistAdvice(0);
+				if(e.getType()==3){
+					List<PublicAssistAdvice> publicAssistAdvices = publicAssistAdviceMapper.selectList(e.getId(), 0);
+					if (publicAssistAdvices.isEmpty()){
+						e.setPublicAssistAdvice(0);
+					}else {
+						e.setPublicAssistAdvice(publicAssistAdvices.size());
+
+					}
 				}else {
-					e.setPublicAssistAdvice(publicAssistAdvices.size());
+					List<PublicAssistAdvice> publicAssistAdvices = publicAssistAdviceMapper.selectList(e.getId(), 1);
+					if (publicAssistAdvices.isEmpty()){
+						e.setPublicAssistAdvice(0);
+					}else {
+						e.setPublicAssistAdvice(publicAssistAdvices.size());
 
+					}
 				}
+
+
+
 			}
 		}