企业信息xml修改

projects-service/src/main/java/com/rtrh/projects/modules/projects/mapper/JUnitMapper.xml

@@ -29,31 +29,31 @@
             amt,
             sim_code AS simCode,
             fax,
-            email,
+            e_mail as email,
             unit_prop_id AS unitPropId,
             is_jur AS isJur,
             unit_kind_id AS unitKindId,
             date_found AS dateFound,
             name_jur1 AS nameJur1,
-            sex1,
-            tel1,
+            sex_1 as sex1,
+            tel_1 as tel1,
             sim_code1 AS simCode1,
             fax_code1 AS faxCode1,
-            email1,
-            kind1,
-            state1,
-            country1,
-            passport1,
+            e_mail1 as email1,
+            kind_1 as kind1,
+            state_1 as state1,
+            country_1 as country1,
+            passport_1 as passport1,
             name_jur2 AS nameJur2,
-            sex2,
-            tel2,
+            sex_2 as  sex2,
+            tel_2 as tel2,
             sim_code2 AS simCode2,
             fax_code2 AS faxCode2,
-            email2,
-            kind2,
-            state2,
-            country2,
-            passport2,
+            e_mail2 as email2,
+            kind_2 as kind2,
+            state_2 as state2,
+            country_2 as country2,
+            passport_2 as passport2,
             file_name AS fileName,
             file_addre AS fileAddre,
             file_prop AS fileProp,
@@ -61,7 +61,7 @@
             name_sp AS nameSp,
             date_sp AS dateSp,
             subject_id AS subjectId
-        FROM junit
+        FROM j_unit
         WHERE id = #{id}
     </select>
     <select id="getListById" resultType="hashmap">

projects/src/main/java/com/rtrh/projects/outapi/controller/AnnualPlanApiController.java

@@ -5,6 +5,7 @@ import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.*;
 
+import com.rtrh.core.repository.Page;
 import com.rtrh.projects.modules.projects.enums.RptContKindEnum;
 import com.rtrh.projects.modules.projects.po.RptCont;
 import com.rtrh.projects.modules.projects.service.SubRptContService;
@@ -84,7 +85,7 @@ public class AnnualPlanApiController extends BaseOutApiController {
     @TokenAuthenticate
     @PostMapping("getList")
     @ApiOperation("获取年度计划列表")
-    public JsonResult getAnnualPlanList(@RequestBody AnnualPlanListQueryVO queryVO) {
+    public JsonResult getAnnualPlanList(@RequestBody Page page, @RequestBody AnnualPlanListQueryVO queryVO) {
         JsonResult jsonResult = new JsonResult();
         try {
             LoginUserVO vo = jwtUtils.getUserInfo(getToken());
@@ -96,7 +97,7 @@ public class AnnualPlanApiController extends BaseOutApiController {
             } else if(OrderType.desc.name().equals(orderType)) {
             	orderType = "2";
             }
-            List<Map<String, Object>> list= workbenchMapper.getProjectYearPlan(queryVO.getYear(),queryVO.getStatus(),queryVO.getXmlx(),queryVO.getXmxz(),queryVO.getHyfl(),queryVO.getUnitName(),queryVO.getSubName(),vo.getLoginName(),queryVO.getJsdd(),queryVO.getMinMoney(),queryVO.getMaxMoney(),queryVO.getIsLock(), orderType,"");
+            List<Map<String, Object>> list= workbenchMapper.pageProjectYearPlan(queryVO.getYear(),queryVO.getStatus(),queryVO.getJsdd(),queryVO.getHyfl(),queryVO.getSubName(),"", orderType,page);
             for (Map<String,Object> map:list){
                 if (currUserUnitId.equals(map.get("unit_id")==null?"":map.get("unit_id"))||checkEdit==true){
                     map.put("checkedit","1");
@@ -118,6 +119,8 @@ public class AnnualPlanApiController extends BaseOutApiController {
 
             }
             jsonResult.setData("list",list);
+            jsonResult.setData("total", page.getTotalCount());
+            jsonResult.setData("totalPage", page.getTotalPage());
         } catch (Exception e) {
             logger.error("", e);
             jsonResult.setCode(ResultCode.SYSTEM_ERROR, e.getMessage());

projects/src/main/java/com/rtrh/projects/outapi/controller/JunitApiController.java

@@ -95,7 +95,11 @@ public class JunitApiController extends BaseOutApiController {
         JsonResult result = new JsonResult();
         try{
                 //企业基本信息
-                JUnit jUnit=jUnitService.getById(idDTO.getId());
+                JUnit jUnit=jUnitService.findById(idDTO.getId());
+                if(jUnit == null){
+                    result.setCode(ResultCode.SYSTEM_ERROR, "信息不存在");
+                    return result;
+                }
                 //数据转换
                 if ("1".equals(jUnit.getKindUnit())){
                     jUnit.setKindUnit("多证合一");