项目统计指标开发

jwtech-admin/src/main/java/com/kms/config/WaterRequestUtil.java

@@ -236,9 +236,11 @@ public class WaterRequestUtil {
         log.info("--------请求获取门户角色信息,请求地址为:"+resourceUrl);
         HashMap<String, Object> hashMap = new HashMap<>();
         hashMap.put("systemCode",systemCode);
-        HttpRequest get = createPost(resourceUrl+"?systemCode="+systemCode,resourceServiceId,resourceAppsecret);
+//        hashMap.put("systemId",systemAppsecret);
+//        HttpRequest get = createPost(resourceUrl+"?systemCode="+systemCode,resourceServiceId,resourceAppsecret);
+        HttpRequest get = createPost(resourceUrl,resourceServiceId,resourceAppsecret);
         get.header("Authorization",authorization);
-        HttpResponse response = get
+        HttpResponse response = get.body(JSONObject.toJSONString(hashMap))
                 .execute();
         String body = response.body();
         WaterResult waterResult = JSONObject.parseObject(body, WaterResult.class);

jwtech-admin/src/main/java/com/kms/web/controller/tool/TestController.java

@@ -47,7 +47,7 @@ public class TestController extends BaseController
 
     @GetMapping("test")
     public WaterResult test(){
-        WaterResult waterResult = waterRequestUtil.usersPage();
+        WaterResult waterResult = waterRequestUtil.getUserResource("bearer 8dfdea94-4eae-483a-baed-131b2bf8589f");
         String data = waterResult.getData();
 //        String records = JSONObject.parseObject(data).getString("records");
 //        List<SingleUser> singleUserList = JSONObject.parseArray(records, SingleUser.class);

jwtech-system/src/main/java/com/kms/build/mapper/BsSgcjsjdBuiProInfoMapper.java

@@ -9,6 +9,7 @@ import com.kms.build.domain.dto.GzjbDto;
 import com.kms.build.domain.dto.HistogramDto;
 
 import com.kms.build.service.BsSgcjsjdBuiProInfoService;
+import com.kms.warn.domain.dto.FlowDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -74,4 +75,7 @@ public interface BsSgcjsjdBuiProInfoMapper extends BaseMapper<BsSgcjsjdBuiProInf
     List<HistogramDto> getHistogram();
 
     List<Num> getNum();
+
+    FlowDto statistics(@Param("proNo") String proNo,
+                       @Param("proCode") String proCode);
 }

jwtech-system/src/main/java/com/kms/build/service/BsSgcjsjdBuiProInfoService.java

@@ -21,6 +21,7 @@ import com.kms.earlyStage.domain.SpecialProjectInfo;
 import com.kms.enterprise.domain.dto.NumDto;
 import com.kms.system.service.SysDeptService;
 import com.kms.system.service.SysXzqhService;
+import com.kms.warn.domain.dto.FlowDto;
 import lombok.Data;
 import org.apache.ibatis.reflection.wrapper.BaseWrapper;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -343,6 +344,13 @@ public class BsSgcjsjdBuiProInfoService extends BaseService<BsSgcjsjdBuiProInfoM
 
     }
 
+    public FlowDto selectFlow(SearchParam<BsSgcjsjdBuiProInfo> sp) {
+        BsSgcjsjdBuiProInfo data = sp.getData();
+        String proNo = data.getProNo();
+        String proCode = data.getProCode();
+        FlowDto dto=bsSgcjsjdBuiProInfoMapper.statistics(proNo, proCode);
+        return dto;
+    }
 
 
     @Data

jwtech-system/src/main/java/com/kms/enterprise/controller/BsSgcYxjdEnterpriseInfoController.java

@@ -10,6 +10,7 @@ import com.jianwei.common.core.domain.SearchParam;
 import com.jianwei.common.core.domain.entity.SysDept;
 import com.jianwei.common.core.domain.entity.SysUser;
 import com.jianwei.common.utils.poi.ExcelUtil;
+import com.kms.build.domain.BsSgcjsjdBuiProInfo;
 import com.kms.common.utils.BaseEntityUtils;
 
 
@@ -76,78 +77,21 @@ public class BsSgcYxjdEnterpriseInfoController extends BaseController
 
 
     /**
-     * 查询企业基本信息列表
+     * 查询企业基本信息列表。根据不同的用户权限和查询条件，返回不同的企业基本信息列表。
+     *
+     * @param sp 包含查询条件和分页信息的搜索参数对象，其中包含了企业基本信息的查询条件。
+     * @return 返回根据查询条件和用户权限分页后的企业基本信息列表。
      */
     @PostMapping("/list")
     @ApiOperation("企业基本信息列表")
     public IPage list(@RequestBody SearchParam<BsSgcYxjdEnterpriseInfo> sp)
     {
-        BsSgcYxjdEnterpriseInfo projectInfo = sp.getData();
-        String adcd = null;
-        if (projectInfo != null) {
-            adcd = projectInfo.getAdcd();
-        }
-
-        SysUser sysUser = UserUtils.getUser();
-        if (sysUser.getUserName().equals("admin")) {
-            if (projectInfo != null && projectInfo.getAdcd() != null) {
-                String infoAdcd = projectInfo.getAdcd();
-                QueryWrapper<SysXzqh> sysXzqhQueryWrapper = new QueryWrapper<>();
-                sysXzqhQueryWrapper.eq("XZQHDM", infoAdcd);
-                SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper);
-                if (xzqh.getLayer()==1) {
-                    infoAdcd = xzqh.getXzqhdm().substring(0, 2);
-
-                } else if (xzqh.getLayer()==2) {
-                    infoAdcd = xzqh.getXzqhdm().substring(0, 4);
-
-                } else {
-                    infoAdcd = xzqh.getXzqhdm();
-                }
-                return bsSgcYxjdEnterpriseInfoService.selectPage(sp, infoAdcd);
-            } else {
-                return bsSgcYxjdEnterpriseInfoService.selectPage(sp, null);
-            }
-
-        } else if (adcd == null) {
-            SysUser user = UserUtils.getUser();
-            String deptId = user.getDeptId();
-            SysDept sysDept = sysDeptService.get(deptId);
-            String xzqhId = sysDept.getXzqhId();
-            SysXzqh xzqh = sysXzqhService.getById(xzqhId);
-            String substring = "";
-            if (xzqh.getLayer()==1) {
-                substring = xzqh.getXzqhdm().substring(0, 2);
-
-            } else if (xzqh.getLayer()==2) {
-                substring = xzqh.getXzqhdm().substring(0, 4);
-
-            } else {
-                substring = xzqh.getXzqhdm();
-            }
-
-            return bsSgcYxjdEnterpriseInfoService.selectPage(sp, substring);
-        } else {
-
-            QueryWrapper<SysXzqh> sysXzqhQueryWrapper = new QueryWrapper<>();
-            sysXzqhQueryWrapper.eq("XZQHDM", adcd);
-
-            SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper);
-            if (xzqh.getLayer()==1) {
-                adcd = xzqh.getXzqhdm().substring(0, 2);
-
-            } else if (xzqh.getLayer()==2) {
-                adcd = xzqh.getXzqhdm().substring(0, 4);
-
-            } else {
-                adcd = xzqh.getXzqhdm();
-            }
-            return bsSgcYxjdEnterpriseInfoService.selectPage(sp, adcd);
-        }
-
+        IPage<BsSgcYxjdEnterpriseInfo> bsSgcYxjdEnterpriseInfoIPage = bsSgcYxjdEnterpriseInfoService.selectPage(sp);
 
+        return bsSgcYxjdEnterpriseInfoIPage;
     }
 
+
     /**
      * 导出企业基本信息列表
      */

jwtech-system/src/main/java/com/kms/enterprise/domain/BsSgcYxjdEnterpriseInfo.java

@@ -182,4 +182,8 @@ public class BsSgcYxjdEnterpriseInfo extends BaseEntity
     private String isBlack;
 
 
+    private String proNo;
+
+    private String proCode;
+
 }

jwtech-system/src/main/java/com/kms/enterprise/mapper/BsSgcYxjdEnterpriseInfoMapper.java

@@ -1,5 +1,7 @@
 package com.kms.enterprise.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.kms.earlyStage.domain.SpecialProjectInfo;
 import com.kms.enterprise.domain.BlackDto;
 import com.kms.enterprise.domain.dto.AreaDto;
@@ -28,4 +30,14 @@ public interface BsSgcYxjdEnterpriseInfoMapper extends BaseMapper<BsSgcYxjdEnter
                                      @Param("orderBy") String orderBy,
                                      @Param("pageNum") int pageNum,
                                      @Param("pageSize") int pageSize);
+
+    IPage<BsSgcYxjdEnterpriseInfo> getByUser(@Param("userId") String id,
+                                             @Param("userType") String userType,
+                                             @Param("proNo") String proNo,
+                                             @Param("proCode") String proCode,
+                                             @Param("enterpriseName") String enterpriseName,
+                                             @Param("adcd") String xzqhId,
+                                             @Param("orderBy") String createTime,
+                                             Page<Object> objectPage);
+
 }

jwtech-system/src/main/java/com/kms/enterprise/service/BsSgcYxjdEnterpriseInfoService.java

@@ -1,23 +1,23 @@
 package com.kms.enterprise.service;
 
-import cn.hutool.core.collection.CollectionUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jianwei.common.core.domain.AjaxResult;
 import com.jianwei.common.core.domain.SearchParam;
-import com.jianwei.common.utils.BeanUtils;
+import com.jianwei.common.core.domain.entity.SysDept;
+import com.jianwei.common.core.domain.entity.SysUser;
+import com.kms.build.domain.BsSgcjsjdBuiProInfo;
+import com.kms.common.utils.UserUtils;
 import com.kms.earlyStage.domain.SpecialProjectInfo;
-import com.kms.enterprise.domain.BlackDto;
-import com.kms.enterprise.domain.BsSgcYxjdQualifications;
 import com.kms.enterprise.domain.dto.AreaDto;
 import com.kms.enterprise.domain.dto.CreditDto;
 import com.kms.enterprise.domain.dto.DisclosureDto;
 import com.kms.enterprise.mapper.BsSgcYxjdQualificationsMapper;
 import com.kms.system.domain.SysXzqh;
 import com.kms.system.mapper.SysXzqhMapper;
+import com.kms.system.service.SysDeptService;
 import com.kms.system.service.SysXzqhService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.jianwei.common.core.service.BaseService;
 import com.kms.enterprise.mapper.BsSgcYxjdEnterpriseInfoMapper;
@@ -28,7 +28,6 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * 企业基本信息Service接口
@@ -48,6 +47,13 @@ public class BsSgcYxjdEnterpriseInfoService extends BaseService<BsSgcYxjdEnterpr
     @Resource
     private SysXzqhMapper sysXzqhMapper;
 
+    @Autowired
+    private SysXzqhService sysXzqhService;
+
+
+    @Autowired
+    private SysDeptService sysDeptService;
+
     public IPage selectPage(SearchParam<BsSgcYxjdEnterpriseInfo> sp, String adcd) {
         BsSgcYxjdEnterpriseInfo data = sp.getData();
 
@@ -55,8 +61,8 @@ public class BsSgcYxjdEnterpriseInfoService extends BaseService<BsSgcYxjdEnterpr
         Map<String, Object> params = sp.getParams();
 
 
-        List<SpecialProjectInfo> list = bsSgcYxjdEnterpriseInfoMapper.getXzqh(data.getId(),data.getEnterpriseName(),
-                adcd,(String)params.get("orderBy"),sp.getPageNum(),sp.getPageSize());
+        List<SpecialProjectInfo> list = bsSgcYxjdEnterpriseInfoMapper.getXzqh(data.getId(), data.getEnterpriseName(),
+                adcd, (String) params.get("orderBy"), sp.getPageNum(), sp.getPageSize());
 
         Page<SpecialProjectInfo> page = new Page<>();
         page.setRecords(list);
@@ -104,10 +110,10 @@ public class BsSgcYxjdEnterpriseInfoService extends BaseService<BsSgcYxjdEnterpr
 
     public AreaDto getArea() {
         List<BsSgcYxjdEnterpriseInfo> list = bsSgcYxjdEnterpriseInfoMapper.getArea();
-        list.stream().filter(x->!x.getAdcd().substring(0,2).equals("44"))
-                .forEach(x->x.setAdcd("省外"));
+        list.stream().filter(x -> !x.getAdcd().substring(0, 2).equals("44"))
+                .forEach(x -> x.setAdcd("省外"));
 
-        list.stream().filter(x->x.getAdcd().equals("4400")).forEach(x->x.setAdcd("省属"));
+        list.stream().filter(x -> x.getAdcd().equals("4400")).forEach(x -> x.setAdcd("省属"));
 
         List<SysXzqh> xzqhList = sysXzqhMapper.getArea();
 
@@ -135,4 +141,17 @@ public class BsSgcYxjdEnterpriseInfoService extends BaseService<BsSgcYxjdEnterpr
     }
 
 
+    public IPage<BsSgcYxjdEnterpriseInfo> selectPage(SearchParam<BsSgcYxjdEnterpriseInfo> sp) {
+        SysUser sysUser = UserUtils.getUser();
+        String deptId = sysUser.getDeptId();
+
+        SysDept sysDept = sysDeptService.get(deptId);
+
+        BsSgcYxjdEnterpriseInfo data = sp.getData();
+        IPage<BsSgcYxjdEnterpriseInfo> page = bsSgcYxjdEnterpriseInfoMapper.getByUser(sysUser.getId(),
+                sysUser.getUserType(), data.getProNo(), data.getProCode(),data.getEnterpriseName(),
+                sysXzqhService.getSubString(sysDept.getXzqhId()), "create_time", new Page<>(sp.getPageNum(), sp.getPageSize()));
+
+        return page;
+    }
 }

jwtech-system/src/main/java/com/kms/warn/controller/ProjectManageController.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.jianwei.common.core.domain.SearchParam;
 import com.kms.build.domain.BsSgcjsjdBuiProInfo;
 import com.kms.build.service.BsSgcjsjdBuiProInfoService;
+import com.kms.warn.domain.dto.FlowDto;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -36,4 +37,17 @@ public class ProjectManageController {
 
 
 
+    @PostMapping("/getInfo")
+    @ApiOperation("项目基本信息管理列表")
+    public FlowDto getInfo(@RequestBody SearchParam<BsSgcjsjdBuiProInfo> sp)
+    {
+
+        FlowDto dto= bsSgcjsjdBuiProInfoService.selectFlow(sp);
+
+        return dto;
+
+    }
+
+
+
 }

jwtech-system/src/main/java/com/kms/warn/domain/Stage.java

@@ -0,0 +1,13 @@
+package com.kms.warn.domain;
+
+
+import lombok.Data;
+
+@Data
+public class Stage {
+
+    private String content;
+
+
+    private String timestamp;
+}

jwtech-system/src/main/java/com/kms/warn/domain/dto/FlowDto.java

@@ -0,0 +1,23 @@
+package com.kms.warn.domain.dto;
+
+import com.kms.warn.domain.Stage;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class FlowDto {
+
+
+    private String stageNow;
+
+    private String durationTotal;
+
+    private String durationNow;
+
+    private String  investmentTotal;
+
+    private String investmentNow;
+
+    private List<Stage> activities;
+}

jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml

@@ -418,4 +418,8 @@
         GROUP BY pi.IS_MAJOR
     </select>
 
+    <select id="statistics" resultType="com.kms.warn.domain.dto.FlowDto">
+
+    </select>
+
 </mapper>

jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectFeasibilityMapper.xml

@@ -49,7 +49,7 @@
         <include refid="SpecialProjectInfo"/>
         <if test="userType==01">
             WHERE
-            pi.PRO_NO IN (
+            pp.PRO_NO IN (
             SELECT
             PRO_NO
             FROM

jwtech-system/src/main/resources/mapper/enterprise/BsSgcYxjdEnterpriseInfoMapper.xml

@@ -12,8 +12,9 @@
                enterprise_type,
                establishment_date,
                legal_representative,
-               corporate_id_number
-        from bs_sgc_yxjd_enterprise_info
+               corporate_id_number,
+               id
+        from bs_sgc_yxjd_enterprise_info ei
     </sql>
 
 
@@ -60,5 +61,60 @@
         order by ${orderBy} desc LIMIT #{pageNum},#{pageSize};
     </select>
 
+    <select id="getByUser" resultMap="EnterpriseInfo">
+        <include refid="info"></include>
+        <if test="userType==01">
+            WHERE
+            ei.PRO_NO IN (
+            SELECT
+            PRO_NO
+            FROM
+            sys_user_pro
+            <where>
+                <if test="userId!=null and userId!=''">
+                    AND user_id=#{userId})
+                </if>
+                <if test="enterpriseName!=null and enterpriseName!=''">
+                    and enterprise_name like concat('%',#{enterpriseName},'%')
+                </if>
+                <if test="adcd!=null and adcd !=''">
+                    and adcd like concat(#{adcd},'%')
+                </if>
+            </where>
+            order by ${orderBy} desc
+        </if>
+        <if test="userType==00">
+            <where>
+                <if test="enterpriseName!=null and enterpriseName!=''">
+                    and enterprise_name like concat('%',#{enterpriseName},'%')
+                </if>
+
+                <if test="adcd!=null and adcd !=''">
+                    and adcd like concat(#{adcd},'%')
+                </if>
+            </where>
+            order by ${orderBy} desc
+        </if>
+        <if test="userType==05">
+            WHERE
+            id IN (
+            SELECT
+            enterprise_id
+            FROM
+            sys_user_enterprise
+            <where>
+                <if test="userId!=null and userId!=''">
+                    AND user_id=#{userId})
+                </if>
+                <if test="enterpriseName!=null and enterpriseName!=''">
+                    and enterprise_name like concat('%',#{enterpriseName},'%')
+                </if>
+
+            </where>
+            order by ${orderBy} desc
+        </if>
+
+    </select>
+
 
 </mapper>