项目统计指标开发

jwtech-admin/src/main/java/com/kms/web/controller/system/SysLoginController.java

@@ -168,6 +168,7 @@ public class SysLoginController extends BaseController {
 		// 用户信息
 		SysUser user = UserUtils.getUser();
 		List<SysMenu> menus = menuService.selectMenuTreeByUserId(user.getId());
+//		List<SysMenu> menus = menuService.selectMenuTreeByUserId("1");
 		return AjaxResult.success(menuService.buildMenus(menus));
 	}
 
@@ -241,7 +242,7 @@ public class SysLoginController extends BaseController {
 
 	/**
 	 * 根据用户token获取资源权限
-	 * @param token
+	 * @param
 	 * @return
 	 */
 //	@GetMapping("/getSingleRotes/{token}")

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

@@ -44,32 +44,34 @@ public interface BsSgcjsjdBuiProInfoMapper extends BaseMapper<BsSgcjsjdBuiProInf
                                            @Param("pageNum") int pageNum,
                                            @Param("pageSize") int pageSize);
 
-    IPage<BsSgcjsjdBuiProInfo> selectManagePage(@Param("id") String id,
-                                               @Param("projectName") String projectName,
-                                               @Param("isMajor") String isMajor,
-                                               @Param("projectType") String projectType,
-                                               @Param("adcd") String adcd,
-                                               @Param("orderBy") String orderBy,
-                                               Page page);
+    IPage<BsSgcjsjdBuiProInfo> selectManagePage(@Param("userId") String userId,
+                                                @Param("userType") String userType,
+                                                @Param("id") String id,
+                                                @Param("projectName") String projectName,
+                                                @Param("isMajor") String isMajor,
+                                                @Param("projectType") String projectType,
+                                                @Param("adcd") String adcd,
+                                                @Param("orderBy") String orderBy,
+                                                Page page);
 
     IPage<AssertStatisticsDto> selectPageByCode(@Param("id") String id,
-                                               @Param("projectName") String projectName,
-                                               @Param("isMajor") String isMajor,
-                                               @Param("projectType") String projectType,
-                                               @Param("adcd") String adcd,
-                                               @Param("orderBy") String orderBy,
-                                               Page page);
+                                                @Param("projectName") String projectName,
+                                                @Param("isMajor") String isMajor,
+                                                @Param("projectType") String projectType,
+                                                @Param("adcd") String adcd,
+                                                @Param("orderBy") String orderBy,
+                                                Page page);
 
     List<GzjbDto> list(@Param("userId") String uerId,
-                        @Param("userType") String userType,
-                        @Param("startDate") Date startDate,
-                        @Param("endDate") Date endDate,
-                        @Param("proNo") String proNo,
-                        @Param("proCode") String proCode,
-                        @Param("adcd") String adcd,
-                        @Param("orderBy") String orderBy,
-                        @Param("pageNum") int pageNum,
-                        @Param("pageSize") int pageSize);
+                       @Param("userType") String userType,
+                       @Param("startDate") Date startDate,
+                       @Param("endDate") Date endDate,
+                       @Param("proNo") String proNo,
+                       @Param("proCode") String proCode,
+                       @Param("adcd") String adcd,
+                       @Param("orderBy") String orderBy,
+                       @Param("pageNum") int pageNum,
+                       @Param("pageSize") int pageSize);
 
 
     List<HistogramDto> getHistogram();

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

@@ -178,7 +178,7 @@ public class BsSgcjsjdBuiProInfoService extends BaseService<BsSgcjsjdBuiProInfoM
         IPage<BsSgcjsjdBuiProInfo> list = null;
 
 
-        list = bsSgcjsjdBuiProInfoMapper.selectManagePage(data.getId(), data.getProjectName(), isMajor, projectType,
+        list = bsSgcjsjdBuiProInfoMapper.selectManagePage(sysUser.getId(),sysUser.getUserType(),data.getId(), data.getProjectName(), isMajor, projectType,
                 sysXzqhService.getSubString(sp.getData().getAdcd()),
                 "create_time", new Page<>(sp.getPageNum(), sp.getPageSize()));
 
@@ -264,7 +264,7 @@ public class BsSgcjsjdBuiProInfoService extends BaseService<BsSgcjsjdBuiProInfoM
         IPage<BsSgcjsjdBuiProInfo> list = null;
 
 
-        list = bsSgcjsjdBuiProInfoMapper.selectManagePage(data.getId(), data.getProjectName(), isMajor, projectType,
+        list = bsSgcjsjdBuiProInfoMapper.selectManagePage(sysUser.getId(),sysUser.getUserType(),data.getId(), data.getProjectName(), isMajor, projectType,
                 sysXzqhService.getSubString(sp.getData().getAdcd()),
                 "create_time", new Page<>(sp.getPageNum(), sp.getPageSize()));
 
@@ -337,7 +337,12 @@ public class BsSgcjsjdBuiProInfoService extends BaseService<BsSgcjsjdBuiProInfoM
                 numDto.setZd(Integer.valueOf(num.getNum()));
             }
         }
-        numDto.setNum(Integer.parseInt(dto.get(0).getNum())+Integer.parseInt(dto.get(1).getNum()));
+        if (dto.size() > 1) {
+            numDto.setNum(Integer.parseInt(dto.get(0).getNum())+Integer.parseInt(dto.get(1).getNum()));
+
+        }else {
+            numDto.setNum(Integer.parseInt(dto.get(0).getNum()));
+        }
 
 
         return numDto;

jwtech-system/src/main/java/com/kms/common/api/CommonApi.java

@@ -175,28 +175,21 @@ public class CommonApi {
         SysUser user = UserUtils.getUser();
         List<SysRole> sysRoles = sysRoleService.getRoleByUserId(user.getId());
         List<SysRole> legalPerson = sysRoles.stream().filter(x -> x.getRoleKey().equals("legalPerson")).collect(Collectors.toList());
-        List<SysRole> enterprise = sysRoles.stream().filter(x -> x.getRoleKey().equals("enterprise")).collect(Collectors.toList());
+//        List<SysRole> enterprise = sysRoles.stream().filter(x -> x.getRoleKey().equals("enterprise")).collect(Collectors.toList());
 
-        if (CollectionUtil.isEmpty(legalPerson)&&CollectionUtil.isEmpty(enterprise)) {
+        if (CollectionUtil.isEmpty(legalPerson)) {
             return AjaxResult.success(true);
-        } else if (CollectionUtil.isNotEmpty(legalPerson)){
+        } else{
             LambdaQueryWrapper<SysUserPro> queryWrapper = Wrappers.lambdaQuery(SysUserPro.class)
                     .eq(SysUserPro::getUserId, user.getId());
 
             List<SysUserPro> list = sysUserProService.list(queryWrapper);
             if (CollectionUtil.isEmpty(list)) {
                 return AjaxResult.success("项目",false);
-            } else if (CollectionUtil.isNotEmpty(list)&& list.stream().filter(x -> Objects.equals(x.getStatus(), "1")).count() == 0){
+            } /*else if (CollectionUtil.isNotEmpty(list)&& list.stream().filter(x -> Objects.equals(x.getStatus(), "1")).count() == 0){
                 return AjaxResult.error("审核未通过,请重新选择", false);
-            }else {
-                return AjaxResult.success(true);
-            }
-        }else {
-            List<SysUserEnterprise> list = sysUserEnterpriseService.list(Wrappers.lambdaQuery(SysUserEnterprise.class)
-                    .eq(SysUserEnterprise::getUserId, user.getId()));
-            if (CollectionUtil.isEmpty(list)) {
-                return AjaxResult.success("企业",false);
-            } else {
+            }*/
+            else {
                 return AjaxResult.success(true);
             }
         }

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

@@ -165,19 +165,46 @@
     <select id="selectManagePage" resultMap="projectManage">
 
         <include refid="projectMangeInfo"></include>
-        <where>
-            <if test="projectName!=null and projectName!=''">
-                and pi.project_name like concat('%',#{projectName},'%')
-            </if>
-            <if test="isMajor!=null and isMajor!=''">
-                and pi.is_major=#{isMajor}
-            </if>
-            <if test="projectType!=null and projectType!=''">
-                and pi.project_type=#{projectType}
-            </if>
-            <include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include>
-        </where>
-        order by pi.${orderBy} desc
+        <if test="userType==01">
+            WHERE
+            pi.PRO_NO IN (
+            SELECT
+            PRO_NO
+            FROM
+            sys_user_pro
+            <where>
+                <if test="userId!=null and userId!=''">
+                    AND user_id=#{userId})
+                </if>
+                <if test="projectName!=null and projectName!=''">
+                    and pi.project_name like concat('%',#{projectName},'%')
+                </if>
+                <if test="isMajor!=null and isMajor!=''">
+                    and pi.is_major=#{isMajor}
+                </if>
+                <if test="projectType!=null and projectType!=''">
+                    and pi.project_type=#{projectType}
+                </if>
+                <include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include>
+            </where>
+            order by pi.${orderBy} desc
+        </if>
+        <if test="userType==00">
+            <where>
+                <if test="projectName!=null and projectName!=''">
+                    and pi.project_name like concat('%',#{projectName},'%')
+                </if>
+                <if test="isMajor!=null and isMajor!=''">
+                    and pi.is_major=#{isMajor}
+                </if>
+                <if test="projectType!=null and projectType!=''">
+                    and pi.project_type=#{projectType}
+                </if>
+                <include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include>
+            </where>
+            order by pi.${orderBy} desc
+        </if>
+
     </select>
 
 

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

@@ -13,7 +13,8 @@
                establishment_date,
                legal_representative,
                corporate_id_number,
-               id
+               id,
+               unified_social_credit_code
         from bs_sgc_yxjd_enterprise_info ei
     </sql>
 
@@ -97,14 +98,14 @@
         </if>
         <if test="userType==05">
             WHERE
-            id IN (
+            unified_social_credit_code IN (
             SELECT
-            enterprise_id
+            sd.unified_social_credit_code
             FROM
-            sys_user_enterprise
+            sys_user su left join sys_dept sd on su.dept_id=sd.id
             <where>
                 <if test="userId!=null and userId!=''">
-                    AND user_id=#{userId})
+                    AND su.id=#{userId})
                 </if>
                 <if test="enterpriseName!=null and enterpriseName!=''">
                     and enterprise_name like concat('%',#{enterpriseName},'%')

jwtech-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -39,7 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select d.id,d.ip_start,d.ip_end,d.is_download,d.is_comment, d.parent_id, d.ancestors,
         d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status,d.tag,
         d.del_flag, d.create_uid, d.create_time, d.name, d.pc_logo, d.pc_background,
-        d.admin_name, d.admin_logo,d.data_type,d.begin_date,d.end_date,d.xzqh_id,d.xzqh_name,d.unifiedSocialCreditCode
+        d.admin_name, d.admin_logo,d.data_type,d.begin_date,d.end_date,d.xzqh_id,d.xzqh_name,d.unified_social_credit_code
         from sys_dept d
     </sql>
 
@@ -181,6 +181,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="ipEnd != null and ipEnd != ''">ip_end = #{ipEnd},</if>
  			<if test="ipStart != null and ipStart != ''">ip_start = #{ipStart},</if>
  			<if test="xzqhId != null and xzqhId != ''">xzqh_id = #{xzqhId},</if>
+ 		    <if test="unifiedSocialCreditCode!=null and unifiedSocialCreditCode!=''">unified_social_credit_code = #{unifiedSocialCreditCode},</if>
 			update_time = sysdate()
  		</set>
  		where id = #{id}