Merge branch 'master' of http://git.ningdatech.com/liushuai/project-management into dev

pmapi/src/main/java/com/ningdatech/pmapi/ding/controller/DingInfoPullController.java

@@ -149,7 +149,7 @@ public class DingInfoPullController {
                 projectDto.setProjectCode(row.getCell(0).toString());
                 projectDto.setProjectName(row.getCell(1).toString());
                 projectDto.setArea(row.getCell(2).toString());
-                projectDto.setAreaCode(row.getCell(3).toString());
+                projectDto.setAreaCode("331123000");
                 String baseProjType = String.valueOf(row.getCell(4));
                 if(StringUtils.isNotBlank(baseProjType) && baseProjType.contains(".")){
                     baseProjType = baseProjType.substring(0,

pmapi/src/main/java/com/ningdatech/pmapi/irs/manage/AppIrsManage.java

@@ -323,13 +323,13 @@ public class AppIrsManage {
         String baseConstructionType = projectDto.getBaseConstructionType();//"01"
         String baseProjType = projectDto.getBaseProjType();//"1"
         String baseProjContacts = projectDto.getContactName();//"毛以林"
-        String isEffective = "1";
+        String isEffective = "02"; // 有效
         String baseConsDeprtDing = projectDto.getBuildOrgCode();//"GO_9a7dce7fbaf54787998fa004f1b7c0e1";
         String baseProjSetProg = projectDto.getBaseProjSetProg();//"04"
         String baseProjContactsCall = projectDto.getContactPhone();//"13857049999"
         String baseProjName = projectDto.getProjectName();//"遂昌县大数据和金融发展中心天工系统"
         String baseProjConsClass = projectDto.getBaseProjConsClass();//"C"
-        String areaCode = projectDto.getAreaCode() + "000";//"331123000"
+        String areaCode = projectDto.getAreaCode();//"331123000"
         String baseAreaName = projectDto.getArea();//"遂昌县";
         String baseManDeprtDing = projectDto.getSuperOrgCode();//"GO_9a7dce7fbaf54787998fa004f1b7c0e1";
         String baseProvManDeprtDing = projectDto.getHigherSuperOrgCode();//"GO_6c383c049d95461f9a0df780140ceb32";