公司级通知信息编辑

src/main/java/com/jeeplus/modules/statement/controller/StatementCompanyComprehensiveController.java

@@ -33,7 +33,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
@@ -88,7 +87,7 @@ public class StatementCompanyComprehensiveController extends BaseController {
         model.addAttribute("reportFormList4",stringListMap.get("reportFormList4"));//合同报表
         model.addAttribute("nyr",nyr);
 
-        return "modules/ruralprojectrecords/cost/reportForm";
+        return "modules/statement/companyDataView";
     }
 
     //公司级：项目报表详细

src/main/java/com/jeeplus/modules/workprojectnotify/web/WorkProjectNotifyController.java

@@ -64,6 +64,8 @@ import com.jeeplus.modules.ruralprojectrecords.entity.*;
 import com.jeeplus.modules.ruralprojectrecords.enums.ProjectStatusEnum;
 import com.jeeplus.modules.ruralprojectrecords.service.*;
 import com.jeeplus.modules.serialnum.service.SerialNumTplService;
+import com.jeeplus.modules.statement.entity.StatementCompanyComprehensiveInfo;
+import com.jeeplus.modules.statement.service.StatementCompanyComprehensiveService;
 import com.jeeplus.modules.sys.dao.RoleDao;
 import com.jeeplus.modules.sys.entity.*;
 import com.jeeplus.modules.sys.service.*;
@@ -502,6 +504,8 @@ public class WorkProjectNotifyController extends BaseController {
 	private RuralProjectMessageElectronicSealService ruralProjectMessageElectronicSealService;
 	@Autowired
 	private ProjectReportedImportService projectReportedImportService;
+	@Autowired
+	private StatementCompanyComprehensiveService statementCompanyComprehensiveService;
 
 	@ModelAttribute
 	public WorkProjectNotify get(@RequestParam(required=false) String id) {
@@ -6892,16 +6896,19 @@ public class WorkProjectNotifyController extends BaseController {
 					//获取年份
 					String year = arguments[0];
 					//获取状态1（0：年；1：季度；2：月份）
-					Integer bigDateType = Integer.valueOf(arguments[1]);
+					String bigDateType = arguments[1];
 					//获取状态2（针对状态1进行精确所在指定季度或者月份）
-					Integer smallDateType = Integer.valueOf(arguments[2]);
+					String smallDateType = arguments[2];
+
+
+					Map<String, List<StatementCompanyComprehensiveInfo>> stringListMap = statementCompanyComprehensiveService.viewList(year,bigDateType,smallDateType);
+					model.addAttribute("reportFormList1",stringListMap.get("reportFormList1"));//项目报表
+					model.addAttribute("reportFormList2",stringListMap.get("reportFormList2"));//开票报表
+					model.addAttribute("reportFormList3",stringListMap.get("reportFormList3"));//报销报表
+					model.addAttribute("reportFormList4",stringListMap.get("reportFormList4"));//合同报表
 
-					WorkRepay workRepay = workRepayService.get(workProjectNotify.getNotifyId());
-					workRepay.setHome("home");
-					workRepay.setAct(getByAct(workRepay.getProcessInstanceId()));
-					model.addAttribute("workRepay", workRepay);
 					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
-						return "modules/workrepay/workRepayView";
+						return "modules/statement/companyDataView";
 					}
 				}
 			}

src/main/resources/jeeplus.properties

@@ -152,9 +152,9 @@ endpoint=http://oss-cn-hangzhou.aliyuncs.com
 accessKeyId=LTAI5tQDWoM9c1WyJNPs86rX
 accessKeySecret=84dDIx4edT1n78KUOqqSmDZ35pchJv
 #\u5F00\u53D1\u73AF\u5883
-#bucketName=xgxm-test
+bucketName=xgxm-test
 #\u751F\u4EA7\u73AF\u5883
-bucketName=xg-ccpm
+#bucketName=xg-ccpm
 avatarDir=app-img/avatar/
 notifyDir=app-img/notify/
 reportDir=app-img/report/
@@ -287,48 +287,50 @@ remoteServer.uploadMode =2
 #\u6587\u4EF6\u670D\u52A1\u5668IP\u5730\u5740
 remoteServer.visit =
 
-apptoken = Mt4een4BN8
-appsecret = qhA4aV2GKE8Oq8k4G3twLiUn4U60cN
-signature = 19ed90930b5b84800ea582e34b71d1dd
-
-signature_http_top = http://172.16.63.24:9182
-
-#竖版模板templateId
-vertical_templateId = 2896237810850173018
-#横板模板templateId
-across_templateId = 2896237585095954500
-#公司圆章
-company_round_seal_id = 2895593387063378002
-#公司圆章-竖
-company_round_seal_id_vertical = 2898042707446829376
-#公司方章
-company_parties_seal_id = 2895597212998434929
-#审定单用印流程id
-approval_category_id = 2895535120981852163
-#报告用印流程id
-report_category_id = 2896237012158222343
-#审定内用印流程id
-judgement_category_id = 2912238663717396786
-
-##192.168.2.6签章测试参数
-#apptoken = uIJQmTwyGJ
-#appsecret = 2NMBqFigKoInmd43Wohxv5aEDKiiHo
-#signature = 232a44ee9ebd251d119f0a65628f678e
+#apptoken = Mt4een4BN8
+#appsecret = qhA4aV2GKE8Oq8k4G3twLiUn4U60cN
+#signature = 19ed90930b5b84800ea582e34b71d1dd
 #
-#signature_http_top = http://192.168.2.6:9182
+#signature_http_top = http://121.40.158.10:9182
 #
 ##竖版模板templateId
-#vertical_templateId = 2894156236229259396
+#vertical_templateId = 2896237810850173018
 ##横板模板templateId
-#across_templateId = 2894156210627227768
+#across_templateId = 2896237585095954500
 ##公司圆章
-#company_round_seal_id = 2894161942659543252
+#company_round_seal_id = 2895593387063378002
 ##公司圆章-竖
-#company_round_seal_id_vertical = 2898043523878957918
+#company_round_seal_id_vertical = 2898042707446829376
 ##公司方章
-#company_parties_seal_id = 2894163220106129636
+#company_parties_seal_id = 2895597212998434929
 ##审定单用印流程id
-#approval_category_id = 2895582833566102435
+#approval_category_id = 2895535120981852163
 ##报告用印流程id
-#report_category_id = 2895618951099527314
+#report_category_id = 2896237012158222343
+##审定内用印流程id
+#judgement_category_id = 2912238663717396786
+
+#192.168.2.6签章测试参数
+apptoken = uIJQmTwyGJ
+appsecret = 2NMBqFigKoInmd43Wohxv5aEDKiiHo
+signature = 232a44ee9ebd251d119f0a65628f678e
+
+signature_http_top = http://192.168.2.6:9182
+
+#竖版模板templateId
+vertical_templateId = 2894156236229259396
+#横板模板templateId
+across_templateId = 2894156210627227768
+#公司圆章
+company_round_seal_id = 2894161942659543252
+#公司圆章-竖
+company_round_seal_id_vertical = 2898043523878957918
+#公司方章
+company_parties_seal_id = 2894163220106129636
+#审定单用印流程id
+approval_category_id = 2895582833566102435
+#报告用印流程id
+report_category_id = 2895618951099527314
+##审定内用印流程id
+judgement_category_id = 2920938119742709765
 

src/main/resources/spring-context-jedis.xml

@@ -9,7 +9,7 @@
 
     <!-- 加载配置属性文件 -->
 	<context:property-placeholder ignore-unresolvable="true" location="classpath:jeeplus.properties" />
-	
+
 	<bean id="jedisPoolConfig" class="redis.clients.jedis.JedisPoolConfig">
 		<property name="maxIdle" value="300" /> <!-- 最大能够保持idel状态的对象数  -->
 		<property name="maxTotal" value="60000" /> <!-- 最大分配的对象数 -->
@@ -20,8 +20,8 @@
 		<constructor-arg index="0" ref="jedisPoolConfig" />
 		<constructor-arg index="1" value="${redis.host}" />
 		<constructor-arg index="2" value="${redis.port}" type="int" />
-		<constructor-arg index="3" value="${redis.timeout}" type="int" />
-		<constructor-arg index="4" value="${redis.password}" />
+		<!--<constructor-arg index="3" value="${redis.timeout}" type="int" />
+		<constructor-arg index="4" value="${redis.password}" />-->
 	</bean>
-	
-</beans>
+
+</beans>