diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/ding/controller/DingInfoPullController.java b/pmapi/src/main/java/com/ningdatech/pmapi/ding/controller/DingInfoPullController.java index f5d3233..89c9f91 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/ding/controller/DingInfoPullController.java +++ b/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, diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/controller/GovProjectCollectionController.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/controller/GovProjectCollectionController.java new file mode 100644 index 0000000..56e0dd3 --- /dev/null +++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/controller/GovProjectCollectionController.java @@ -0,0 +1,48 @@ +package com.ningdatech.pmapi.gov.controller; + + +import com.ningdatech.pmapi.gov.manage.BelongOrgManage; +import com.ningdatech.pmapi.gov.model.vo.GovBusinessStripVO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + *

+ * 前端控制器 + *

+ * + * @author zpf + * @since 2023-08-21 + */ +@Slf4j +@Validated +@RestController +@RequiredArgsConstructor +@Api(value = "GovProjectCollectionController", tags = "电子政务规范项目归集控制器") +@RequestMapping("/api/v1/gov-project-collection") +public class GovProjectCollectionController { + + private final BelongOrgManage belongOrgManage; + + @GetMapping("/dictionary") + @ApiOperation("获取条线列表") + public List getGovBusinessStripList(@RequestParam(value = "type", required = false) String type) { + return belongOrgManage.getGovBusinessStripList(type); + } + + @GetMapping("/business-strip/expert/analysis") + @ApiOperation("分析专家数据") + public void analysisExpertOrg() { + belongOrgManage.analysisExpertOrg(); + } + +} diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/manage/GovProjectCollectionManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/manage/GovProjectCollectionManage.java new file mode 100644 index 0000000..8c8400c --- /dev/null +++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/manage/GovProjectCollectionManage.java @@ -0,0 +1,15 @@ +package com.ningdatech.pmapi.gov.manage; + +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; + +/** + * @author zpf + * @date 2023/8/21 下午2:27 + */ + +@Component +@RequiredArgsConstructor +public class GovProjectCollectionManage { + +} diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/irs/manage/AppIrsManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/irs/manage/AppIrsManage.java index 89386af..17451b4 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/irs/manage/AppIrsManage.java +++ b/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";