项目统计指标开发

jwtech-framework/src/main/java/com/jianwei/common/core/domain/entity/SysDept.java

@@ -118,6 +118,8 @@ public class SysDept extends BaseEntity
     @TableField(exist = false)
     private List<String> classifyId;//专题库的id集合
 
+    private String unifiedSocialCreditCode;
+
     public List<String> addLibraryIds(String id){
     	if(StringUtils.isEmpty(specialLibraryIds)) {
     		specialLibraryIds = new ArrayList<>();

jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectInfoController.java

@@ -91,13 +91,13 @@ public class SpecialProjectInfoController extends BaseController {
     @ApiOperation("专题项目前期背景信息列表")
     public IPage list(@RequestBody SearchParam<SpecialProjectInfo> sp) {
 
-        if (ObjectUtil.isNull(sp.getData())) {
+        /*if (ObjectUtil.isNull(sp.getData())) {
             Page<SpecialProjectInfo> page = new Page<>();
             List<SpecialProjectInfo> list = specialProjectInfoService.list();
             page.setRecords(list);
             page.setTotal(list.size());
             return page;
-        }
+        }*/
 
         IPage<SpecialProjectInfo> specialProjectInfoIPage = specialProjectInfoService.selectPage(sp);
 

jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectInfoService.java

@@ -77,7 +77,11 @@ public class SpecialProjectInfoService extends BaseService<SpecialProjectInfoMap
             list1 = specialProjectInfoMapper.getByUserPro(new Page(sp.getPageNum(),sp.getPageSize()),sysUser.getId(), sysUser.getUserType(), data.getId(), data.getProjectName(), data.getProNo(),
                     data.getProjectType(), sysXzqhService.getSubString(sp.getData().getAdcd()), "create_time");
         } else {
-            list1 = specialProjectInfoMapper.getByUserPro(new Page(sp.getPageNum(),sp.getPageSize()),sysUser.getId(), sysUser.getUserType(), data.getId(), data.getProjectName(), data.getProNo(),
+            list1 = specialProjectInfoMapper.getByUserPro(new Page(sp.getPageNum(),sp.getPageSize()),
+                    sysUser.getId(), sysUser.getUserType(),
+                    data.getId(),
+                    data.getProjectName(),
+                    data.getProNo(),
                     data.getProjectType(), sysXzqhService.getSubString(sp.getData().getAdcd()), (String) params.get("orderBy"));
         }
 

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.admin_name, d.admin_logo,d.data_type,d.begin_date,d.end_date,d.xzqh_id,d.xzqh_name,d.unifiedSocialCreditCode
         from sys_dept d
     </sql>
 
@@ -125,6 +125,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="adminName != null and adminName != ''">admin_name,</if>
  			<if test="adminLogo != null and adminLogo != ''">admin_logo,</if>
  			<if test="xzqhId != null and adminLogo != ''">xzqh_id,</if>
+ 		    <if test="unifiedSocialCreditCode!=null and unifiedSocialCreditCode!=''">unified_social_credit_code</if>
  			create_time
  		)values(
  			<if test="id != null and id != ''">#{id},</if>
@@ -151,6 +152,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="adminName != null and adminName != ''">#{adminName},</if>
 			<if test="adminLogo != null and adminLogo != ''">#{adminLogo},</if>
 		<if test="xzqhId != null and adminLogo != ''">#{xzqhId},</if>
+		<if test="unifiedSocialCreditCode!=null and unifiedSocialCreditCode!=''">#{unifiedSocialCreditCode}</if>
  			sysdate()
  		)
 	</insert>