功能模块新增

jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiDjjgdController.java

@@ -53,7 +53,7 @@ public class BsSgcJsjdBuiDjjgdController extends BaseController
     @ApiOperation("【请填写功能名称】列表")
     public IPage list(@RequestBody SearchParam<BsSgcJsjdBuiDjjgd> sp)
     {
-        return bsSgcJsjdBuiDjjgdService.selectPage(sp);
+        return bsSgcJsjdBuiDjjgdService.selectPage1(sp);
     }
 
     /**

jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiDjjgd.java

@@ -1,5 +1,6 @@
 package com.kms.build.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -30,6 +31,9 @@ public class BsSgcJsjdBuiDjjgd extends BaseEntity
     @ApiModelProperty("项目编码")
     private String proCode;
 
+    @TableField(exist = false)
+    private String projectName;
+
     /** 项目编号 */
     @Excel(name = "项目编号")
     @ApiModelProperty("项目编号")

jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiGzbzj.java

@@ -92,4 +92,10 @@ public class BsSgcJsjdBuiGzbzj extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date yearMonthDate;
 
+    /** 收入日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date incomeDate;
+    /** 收入金额 */
+    private String incomeAmount;
+
 }

jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiRealName.java

@@ -108,10 +108,10 @@ public class BsSgcJsjdBuiRealName extends BaseEntity
     @Excel(name = "手机号")
     private String  phone;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8")
     private Date admissionTime;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8")
     private Date exitTime;
 
 }

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

@@ -1,10 +1,21 @@
 package com.kms.build.service;
 
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jianwei.common.core.domain.SearchParam;
+import com.jianwei.common.mybaitsplus.BeanToWrapper;
 import com.kms.build.domain.BsSgcJsjdBuiDjjgd;
+import com.kms.build.domain.BsSgcjsjdBuiProInfo;
 import com.kms.build.mapper.BsSgcJsjdBuiDjjgdMapper;
+import com.kms.build.mapper.BsSgcjsjdBuiProInfoMapper;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.jianwei.common.core.service.BaseService;
 
+import java.util.List;
 
 
 /**
@@ -15,5 +26,21 @@ import com.jianwei.common.core.service.BaseService;
  */
 @Service
 public class BsSgcJsjdBuiDjjgdService extends BaseService<BsSgcJsjdBuiDjjgdMapper, BsSgcJsjdBuiDjjgd>{
+    @Autowired
+    BsSgcjsjdBuiProInfoMapper bsSgcjsjdBuiProInfoMapper;
 
+    public IPage<BsSgcJsjdBuiDjjgd> selectPage1(SearchParam<BsSgcJsjdBuiDjjgd> sp){
+        Page page = getBaseMapper().selectPage(new Page<>(sp.getPageNum(), sp.getPageSize()), BeanToWrapper.getWrapper(sp));
+        List<BsSgcJsjdBuiDjjgd>records = page.getRecords();
+        for (BsSgcJsjdBuiDjjgd bsSgcJsjdBuiDjjgd:records){
+            String proNo=bsSgcJsjdBuiDjjgd.getProNo();
+            String proCode=bsSgcJsjdBuiDjjgd.getProCode();
+            BsSgcjsjdBuiProInfo bsSgcjsjdBuiProInfo = bsSgcjsjdBuiProInfoMapper.selectOne(new QueryWrapper<BsSgcjsjdBuiProInfo>().eq("pro_no", proNo)
+                    .eq("pro_code", proCode));
+            if (ObjectUtil.isNotEmpty(bsSgcjsjdBuiProInfo.getProjectName())){
+                bsSgcJsjdBuiDjjgd.setProjectName(bsSgcjsjdBuiProInfo.getProjectName());
+            }
+        }
+        return page;
+    }
 }