Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/projectrecord/service/ProjectRecordsService.java

@@ -1468,4 +1468,4 @@ public class ProjectRecordsService extends CrudService<ProjectRecordsDao, Projec
 	}
 
 
-}
+}

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectMessageNewService.java

@@ -2843,7 +2843,7 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
         //判断审核增减率
         //判断审核增减率是否大于30%（大于则为false，否则为true）
         if(StringUtils.isNotBlank(reported.getJingHeJianLv())){
-            if(Double.valueOf(reported.getJingHeJianLv())>30 ){
+            if(Double.valueOf(reported.getJingHeJianLv())>30 || Double.valueOf(reported.getJingHeJianLv())< -30 ){
                 bmzrList = Lists.newArrayList();
                 bmzrList.add(zsUser);
                 variables.put("bmzrCount",bmzrList.size());
@@ -3094,47 +3094,60 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
                             if(!"Success".equals(client)){
                                 return "上报失败！";
                             }*/
-
-                            //信用代码id
-                            String jsonUscCode = "{\"uscCode\": \"91320000746823994F\"";
-                            Map map = RuralProjectReportedInfoUtil.reportedDataManage(reported);
-                            String jsonUscData = JSONObject.toJSONString(map);
-                            byte[] privateKey = org.apache.commons.codec.binary.Base64.decodeBase64(PRIVATE_KEY);
-                            //客户拿到密钥将自己的数据 jsonUscData 进行非对称加密。
-                            byte[] encryptByPrivateKey = new byte[0];
-                            try {
-                                encryptByPrivateKey = Rsatool.encryptByPrivateKey(jsonUscData.getBytes(), privateKey);
-                            } catch (Exception e) {
-                                e.printStackTrace();
-                            }
-                            //将唯一标志和非对称加密后数据采用对称加密，方便传到服务段解析，并获得非对称的公钥来解密客户用密钥加密的数据
-                            String encryString = jsonUscCode + ",\"data\":\"" + Base64.encodeBase64String(encryptByPrivateKey) + "\"}";
-                            String encryptByAes = null;
-                            try {
-                                encryptByAes = Aestool.Encrypt(encryString, AES_KEY);
-                            } catch (Exception e) {
-                                e.printStackTrace();
-                            }
-                            //测试接口
-                            //String url = "http://comp.jszj.com.cn:8031/api/testAddProject";
-                            //正式接口
-                            String url = "http://comp.jszj.com.cn:8031/api/addProject";
-                            //发送请求
-                            String returnResult = HttpPostTool.doPost(url, encryptByAes);
-                            HashMap hashMap = JSON.parseObject(returnResult, HashMap.class);
-                            if(!"1".equals(hashMap.get("code"))){
-                                return "上报失败：" + hashMap.get("msg").toString();
-                            }
-                            //修改项目上报表中状态
-                            reported.setReportStatus(String.valueOf(ProjectStatusEnum.SIGNED.getValue()));
-
-                            //修改项目表中上报状态
-                            //判断项目是否超期，如果超期则将上报标志改为超期上报（7） 否则变更为正常上报数据
-                            if(1 == record.getOverDueStatus()){
-                                records.setReportedState("7");
+                            if(Double.valueOf(reported.getJingHeJianLv())>30 || Double.valueOf(reported.getJingHeJianLv())< -30 ) {
+                                //修改项目上报表中状态
+                                reported.setReportStatus(String.valueOf(ProjectStatusEnum.DISPENSE.getValue()));
+
+                                //修改项目表中上报状态
+                                //判断项目是否超期，如果超期则将上报标志改为超期上报（7） 否则变更为正常上报数据
+                                if(1 == record.getOverDueStatus()){
+                                    records.setReportedState("11");
+                                }else{
+                                    records.setReportedState(String.valueOf(ProjectStatusEnum.DISPENSE.getValue()));
+                                }
                             }else{
-                                records.setReportedState(String.valueOf(ProjectStatusEnum.SIGNED.getValue()));
+                                //信用代码id
+                                String jsonUscCode = "{\"uscCode\": \"91320000746823994F\"";
+                                Map map = RuralProjectReportedInfoUtil.reportedDataManage(reported);
+                                String jsonUscData = JSONObject.toJSONString(map);
+                                byte[] privateKey = org.apache.commons.codec.binary.Base64.decodeBase64(PRIVATE_KEY);
+                                //客户拿到密钥将自己的数据 jsonUscData 进行非对称加密。
+                                byte[] encryptByPrivateKey = new byte[0];
+                                try {
+                                    encryptByPrivateKey = Rsatool.encryptByPrivateKey(jsonUscData.getBytes(), privateKey);
+                                } catch (Exception e) {
+                                    e.printStackTrace();
+                                }
+                                //将唯一标志和非对称加密后数据采用对称加密，方便传到服务段解析，并获得非对称的公钥来解密客户用密钥加密的数据
+                                String encryString = jsonUscCode + ",\"data\":\"" + Base64.encodeBase64String(encryptByPrivateKey) + "\"}";
+                                String encryptByAes = null;
+                                try {
+                                    encryptByAes = Aestool.Encrypt(encryString, AES_KEY);
+                                } catch (Exception e) {
+                                    e.printStackTrace();
+                                }
+                                //测试接口
+                                //String url = "http://comp.jszj.com.cn:8031/api/testAddProject";
+                                //正式接口
+                                String url = "http://comp.jszj.com.cn:8031/api/addProject";
+                                //发送请求
+                                String returnResult = HttpPostTool.doPost(url, encryptByAes);
+                                HashMap hashMap = JSON.parseObject(returnResult, HashMap.class);
+                                if(!"1".equals(hashMap.get("code"))){
+                                    return "上报失败：" + hashMap.get("msg").toString();
+                                }
+                                //修改项目上报表中状态
+                                reported.setReportStatus(String.valueOf(ProjectStatusEnum.SIGNED.getValue()));
+
+                                //修改项目表中上报状态
+                                //判断项目是否超期，如果超期则将上报标志改为超期上报（7） 否则变更为正常上报数据
+                                if(1 == record.getOverDueStatus()){
+                                    records.setReportedState("7");
+                                }else{
+                                    records.setReportedState(String.valueOf(ProjectStatusEnum.SIGNED.getValue()));
+                                }
                             }
+
                         } else {
                             notifyRole = "调整上报信息";
                             workActivityProcess.setIsApproval("2");

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralCostProjectMessageNewController.java

@@ -1707,7 +1707,7 @@ public class RuralCostProjectMessageNewController extends BaseController {
                 //判断审核增减率
                 //判断审核增减率是否大于30%（大于则为false，否则为true）
                 if(StringUtils.isNotBlank(reported.getJingHeJianLv())){
-                    if(Double.valueOf(reported.getJingHeJianLv())>30) {
+                    if(Double.valueOf(reported.getJingHeJianLv())>30 || Double.valueOf(reported.getJingHeJianLv())< -30 ) {
                         //获取项目信息
                         ProjectRecords projectRecords = projectRecordsServices.getRuralMasters(reported.getProjectId());
                         //查询报告信息

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectMessageNewController.java

@@ -1544,7 +1544,7 @@ public class RuralProjectMessageNewController extends BaseController {
                 //判断审核增减率
                 //判断审核增减率是否大于30%（大于则为false，否则为true）
                 if(StringUtils.isNotBlank(reported.getJingHeJianLv())){
-                    if(Double.valueOf(reported.getJingHeJianLv())>30) {
+                    if(Double.valueOf(reported.getJingHeJianLv())>30 || Double.valueOf(reported.getJingHeJianLv())< -30 ) {
                         //获取项目信息
                         ProjectRecords projectRecords = projectRecordsServices.getRuralMasters(reported.getProjectId());
                         //查询报告信息

src/main/java/com/jeeplus/modules/sys/web/LoginController.java

@@ -421,7 +421,10 @@ public class LoginController extends BaseController{
 		workProjectNotify.setCompanyId(user.getComId());
 		workProjectNotify.setRemarks("待审批");
 		//待办事项
-		Page<WorkProjectNotify> notifyPage = workProjectNotifyService.findPage(new Page<WorkProjectNotify>(request, response), workProjectNotify);
+		Page<WorkProjectNotify> workProjectNotifyPage = new Page<>(request, response);
+		workProjectNotifyPage.setPageNo(1);
+		workProjectNotifyPage.setPageSize(10);
+		Page<WorkProjectNotify> notifyPage = workProjectNotifyService.findPage(workProjectNotifyPage, workProjectNotify);
 		if(notifyPage.getList().size()>0){
 			for (WorkProjectNotify info: notifyPage.getList()) {
 				//对项目进行处理，工程咨询，造价审核可添加作废按钮

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

@@ -1969,7 +1969,7 @@ public class WorkProjectNotifyController extends BaseController {
 						model.addAttribute("identification", "projectReported");
 						model.addAttribute("identificationName","项目上报审核意见");
 						if(StringUtils.isNotBlank(reported.getJingHeJianLv())){
-							if(Double.valueOf(reported.getJingHeJianLv())>30){
+							if(Double.valueOf(reported.getJingHeJianLv())>30 || Double.valueOf(reported.getJingHeJianLv())< -30 ){
 								return "modules/ruralprojectrecords/cost/newReported/bzshbReportedAudit";
 							}
 						}

src/main/resources/mappings/modules/workprojectnotify/WorkProjectNotifyDao.xml

@@ -137,7 +137,7 @@
 				ORDER BY ${page.orderBy}
 			</when>
 			<otherwise>
-				ORDER BY a.create_date DESC
+				ORDER BY a.create_date DESC,a.id
 			</otherwise>
 		</choose>
 	</select>