Merge remote-tracking branch 'origin/master'

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

@@ -0,0 +1,114 @@
+package com.kms.build.controller;
+
+import java.util.Arrays;
+import java.util.List;
+
+import com.jianwei.common.core.controller.BaseController;
+import com.jianwei.common.core.domain.SearchParam;
+import com.jianwei.common.utils.poi.ExcelUtil;
+import com.kms.common.utils.BaseEntityUtils;
+
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.jianwei.common.mybaitsplus.BeanToWrapper;
+
+import com.jianwei.common.annotation.Log;
+import com.jianwei.common.core.domain.AjaxResult;
+import com.jianwei.common.enums.BusinessType;
+import com.kms.build.domain.BsSgcJsjdBuiDedicatedAccount;
+import com.kms.build.service.BsSgcJsjdBuiDedicatedAccountService;
+
+
+/**
+ * 农民工工资专用账户Controller
+ *
+ * @author kms
+ * @date 2024-06-19
+ */
+@RestController
+@RequestMapping("/build/account")
+@Api(tags = "农民工工资专用账户")
+public class BsSgcJsjdBuiDedicatedAccountController extends BaseController
+{
+    @Autowired
+    private BsSgcJsjdBuiDedicatedAccountService bsSgcJsjdBuiDedicatedAccountService;
+
+    /**
+     * 查询农民工工资专用账户列表
+     */
+    @PostMapping("/list")
+    @ApiOperation("农民工工资专用账户列表")
+    public IPage list(@RequestBody SearchParam<BsSgcJsjdBuiDedicatedAccount> sp)
+    {
+        return bsSgcJsjdBuiDedicatedAccountService.selectPage(sp);
+    }
+
+    /**
+     * 导出农民工工资专用账户列表
+     */
+    @Log(title = "农民工工资专用账户导出", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ApiOperation("农民工工资专用账户导出")
+    public AjaxResult export(@RequestBody BsSgcJsjdBuiDedicatedAccount bsSgcJsjdBuiDedicatedAccount)
+    {
+        List<BsSgcJsjdBuiDedicatedAccount> list = bsSgcJsjdBuiDedicatedAccountService.listByIds(bsSgcJsjdBuiDedicatedAccount.getIds());
+        ExcelUtil<BsSgcJsjdBuiDedicatedAccount> util = new ExcelUtil<>(BsSgcJsjdBuiDedicatedAccount.class);
+        return util.exportExcel(list, "account");
+    }
+
+    /**
+     * 获取农民工工资专用账户详细信息
+     */
+    @ApiOperation(" 农民工工资专用账户详情")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id)
+    {
+        return AjaxResult.success(bsSgcJsjdBuiDedicatedAccountService.getById(id));
+    }
+
+    /**
+     * 新增农民工工资专用账户
+     */
+    @Log(title = "农民工工资专用账户新增", businessType = BusinessType.INSERT)
+    @PostMapping
+    @ApiOperation("农民工工资专用账户新增")
+    public AjaxResult add(@RequestBody BsSgcJsjdBuiDedicatedAccount bsSgcJsjdBuiDedicatedAccount)
+    {
+        BaseEntityUtils.preInsert(bsSgcJsjdBuiDedicatedAccount);
+        return toAjax(bsSgcJsjdBuiDedicatedAccountService.save(bsSgcJsjdBuiDedicatedAccount));
+    }
+
+    /**
+     * 修改农民工工资专用账户
+     */
+    @ApiOperation("农民工工资专用账户修改")
+    @Log(title = "农民工工资专用账户修改", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody BsSgcJsjdBuiDedicatedAccount bsSgcJsjdBuiDedicatedAccount)
+    {
+        return toAjax(bsSgcJsjdBuiDedicatedAccountService.updateById(bsSgcJsjdBuiDedicatedAccount));
+    }
+
+    /**
+     * 删除农民工工资专用账户
+     */
+    @ApiOperation("农民工工资专用账户删除")
+    @Log(title = "农民工工资专用账户删除", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(bsSgcJsjdBuiDedicatedAccountService.removeByIds(Arrays.asList(ids)));
+    }
+}

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

@@ -3,10 +3,16 @@ package com.kms.build.controller;
 import java.util.Arrays;
 import java.util.List;
 
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.jianwei.common.core.controller.BaseController;
 import com.jianwei.common.core.domain.SearchParam;
 import com.jianwei.common.utils.poi.ExcelUtil;
+import com.kms.build.domain.BsSgcJsjdBuiDedicatedAccount;
 import com.kms.build.domain.BsSgcJsjdBuiGzbzj;
+import com.kms.build.mapper.BsSgcJsjdBuiDedicatedAccountMapper;
+import com.kms.build.service.BsSgcJsjdBuiDedicatedAccountService;
 import com.kms.build.service.BsSgcJsjdBuiGzbzjService;
 import com.kms.common.utils.BaseEntityUtils;
 
@@ -51,6 +57,9 @@ public class BsSgcJsjdBuiGzbzjController extends BaseController
     @Autowired
     WarningJudgment warningJudgment;
 
+
+    @Autowired
+    BsSgcJsjdBuiDedicatedAccountMapper bsSgcJsjdBuiDedicatedAccountMapper;
     /**
      * 查询工资保证金列表
      */
@@ -92,6 +101,16 @@ public class BsSgcJsjdBuiGzbzjController extends BaseController
     @ApiOperation("工资保证金新增")
     public AjaxResult add(@RequestBody BsSgcJsjdBuiGzbzj bsSgcJsjdBuiGzbzj)
     {
+        LambdaQueryWrapper<BsSgcJsjdBuiDedicatedAccount> qw=new LambdaQueryWrapper<>();
+        BsSgcJsjdBuiDedicatedAccount bsSgcJsjdBuiDedicatedAccount = bsSgcJsjdBuiDedicatedAccountMapper.selectOne(qw.eq(BsSgcJsjdBuiDedicatedAccount::getProNo, bsSgcJsjdBuiGzbzj.getProNo())
+                .eq(BsSgcJsjdBuiDedicatedAccount::getProCode, bsSgcJsjdBuiGzbzj.getProjectCode())
+                .eq(BsSgcJsjdBuiDedicatedAccount::getDedicatedAccounts, bsSgcJsjdBuiGzbzj.getDedicatedAccounts()));
+
+        if (ObjectUtil.isNotEmpty(bsSgcJsjdBuiDedicatedAccount)){
+            if (bsSgcJsjdBuiDedicatedAccount.getStatus().equals("0")){
+                return AjaxResult.error("该专用账户已撤销");
+            }
+        }
         BaseEntityUtils.preInsert(bsSgcJsjdBuiGzbzj);
         AjaxResult ajaxResult = toAjax(bsSgcJsjdBuiGzbzjService.save(bsSgcJsjdBuiGzbzj));
         warningJudgment.GzbzjWarn(bsSgcJsjdBuiGzbzj);

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

@@ -0,0 +1,114 @@
+package com.kms.build.controller;
+
+import java.util.Arrays;
+import java.util.List;
+
+import com.jianwei.common.core.controller.BaseController;
+import com.jianwei.common.core.domain.SearchParam;
+import com.jianwei.common.utils.poi.ExcelUtil;
+import com.kms.common.utils.BaseEntityUtils;
+
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.jianwei.common.mybaitsplus.BeanToWrapper;
+
+import com.jianwei.common.annotation.Log;
+import com.jianwei.common.core.domain.AjaxResult;
+import com.jianwei.common.enums.BusinessType;
+import com.kms.build.domain.BsSgcJsjdBuiRealNamePro;
+import com.kms.build.service.BsSgcJsjdBuiRealNameProService;
+
+
+/**
+ * 农民工实行信息关联项目Controller
+ *
+ * @author kms
+ * @date 2024-06-19
+ */
+@RestController
+@RequestMapping("/build/realNamePro")
+@Api(tags = "农民工实行信息关联项目")
+public class BsSgcJsjdBuiRealNameProController extends BaseController
+{
+    @Autowired
+    private BsSgcJsjdBuiRealNameProService bsSgcJsjdBuiRealNameProService;
+
+    /**
+     * 查询农民工实行信息关联项目列表
+     */
+    @PostMapping("/list")
+    @ApiOperation("农民工实行信息关联项目列表")
+    public IPage list(@RequestBody SearchParam<BsSgcJsjdBuiRealNamePro> sp)
+    {
+        return bsSgcJsjdBuiRealNameProService.selectPage(sp);
+    }
+
+    /**
+     * 导出农民工实行信息关联项目列表
+     */
+    @Log(title = "农民工实行信息关联项目导出", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ApiOperation("农民工实行信息关联项目导出")
+    public AjaxResult export(@RequestBody BsSgcJsjdBuiRealNamePro bsSgcJsjdBuiRealNamePro)
+    {
+        List<BsSgcJsjdBuiRealNamePro> list = bsSgcJsjdBuiRealNameProService.listByIds(bsSgcJsjdBuiRealNamePro.getIds());
+        ExcelUtil<BsSgcJsjdBuiRealNamePro> util = new ExcelUtil<>(BsSgcJsjdBuiRealNamePro.class);
+        return util.exportExcel(list, "realNamePro");
+    }
+
+    /**
+     * 获取农民工实行信息关联项目详细信息
+     */
+    @ApiOperation(" 农民工实行信息关联项目详情")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id)
+    {
+        return AjaxResult.success(bsSgcJsjdBuiRealNameProService.getById(id));
+    }
+
+    /**
+     * 新增农民工实行信息关联项目
+     */
+    @Log(title = "农民工实行信息关联项目新增", businessType = BusinessType.INSERT)
+    @PostMapping
+    @ApiOperation("农民工实行信息关联项目新增")
+    public AjaxResult add(@RequestBody BsSgcJsjdBuiRealNamePro bsSgcJsjdBuiRealNamePro)
+    {
+        BaseEntityUtils.preInsert(bsSgcJsjdBuiRealNamePro);
+        return toAjax(bsSgcJsjdBuiRealNameProService.save(bsSgcJsjdBuiRealNamePro));
+    }
+
+    /**
+     * 修改农民工实行信息关联项目
+     */
+    @ApiOperation("农民工实行信息关联项目修改")
+    @Log(title = "农民工实行信息关联项目修改", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody BsSgcJsjdBuiRealNamePro bsSgcJsjdBuiRealNamePro)
+    {
+        return toAjax(bsSgcJsjdBuiRealNameProService.updateById(bsSgcJsjdBuiRealNamePro));
+    }
+
+    /**
+     * 删除农民工实行信息关联项目
+     */
+    @ApiOperation("农民工实行信息关联项目删除")
+    @Log(title = "农民工实行信息关联项目删除", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(bsSgcJsjdBuiRealNameProService.removeByIds(Arrays.asList(ids)));
+    }
+}

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

@@ -0,0 +1,82 @@
+package com.kms.build.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.jianwei.common.annotation.Excel;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+
+import com.jianwei.common.core.domain.BaseEntity;
+
+/**
+ * 农民工工资专用账户对象 bs_sgc_jsjd_bui_dedicated_account
+ *
+ * @author kms
+ * @date 2024-06-19
+ */
+@TableName("bs_sgc_jsjd_bui_dedicated_account")
+@Data
+@ApiModel("农民工工资专用账户")
+public class BsSgcJsjdBuiDedicatedAccount extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    @ApiModelProperty("${comment}")
+    private String proNo;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    @ApiModelProperty("${comment}")
+    private String proCode;
+
+    /** 专用账户 */
+    @Excel(name = "专用账户")
+    @ApiModelProperty("专用账户")
+    private String dedicatedAccounts;
+
+    /** 账户开设时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "账户开设时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty("账户开设时间")
+    private Date accountsTime;
+
+    /** 开户行 */
+    @Excel(name = "开户行")
+    @ApiModelProperty("开户行")
+    private String bank;
+
+    /** 是否撤销 0是 1否 */
+    @Excel(name = "是否撤销 0是 1否")
+    @ApiModelProperty("是否撤销 0是 1否")
+    private String status;
+
+    /** 撤销时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "撤销时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty("撤销时间")
+    private Date cancellationTime;
+
+    /** 承诺书 */
+    @Excel(name = "承诺书")
+    @ApiModelProperty("承诺书")
+    private String commitmentLetter;
+
+    /** $column.columnComment */
+    @Excel(name = "承诺书")
+    @ApiModelProperty("承诺书")
+    private String createUid;
+
+    /** $column.columnComment */
+    @Excel(name = "承诺书")
+    @ApiModelProperty("承诺书")
+    private String updateUid;
+
+}

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

@@ -0,0 +1,60 @@
+package com.kms.build.domain;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.jianwei.common.annotation.Excel;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+
+import com.jianwei.common.core.domain.BaseEntity;
+
+/**
+ * 农民工实行信息关联项目对象 bs_sgc_jsjd_bui_real_name_pro
+ *
+ * @author kms
+ * @date 2024-06-19
+ */
+@TableName("bs_sgc_jsjd_bui_real_name_pro")
+@Data
+@ApiModel("农民工实行信息关联项目")
+public class BsSgcJsjdBuiRealNamePro extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 项目名称 */
+    @Excel(name = "项目名称")
+    @ApiModelProperty("项目名称")
+    private String projectName;
+
+    /** 项目编码 */
+    @Excel(name = "项目编码")
+    @ApiModelProperty("项目编码")
+    private String proCode;
+
+    /** 行政区划 */
+    @Excel(name = "行政区划")
+    @ApiModelProperty("行政区划")
+    private String adcd;
+
+    /** 是否有项目书审批 */
+    @Excel(name = "是否有项目书审批")
+    @ApiModelProperty("是否有项目书审批")
+    private String isApproval;
+
+    /** $column.columnComment */
+    @Excel(name = "是否有项目书审批")
+    @ApiModelProperty("是否有项目书审批")
+    private String createUid;
+
+    /** $column.columnComment */
+    @Excel(name = "是否有项目书审批")
+    @ApiModelProperty("是否有项目书审批")
+    private String updateUid;
+
+    private String proNo;
+
+}

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

@@ -0,0 +1,16 @@
+package com.kms.build.mapper;
+
+import org.springframework.stereotype.Repository;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.kms.build.domain.BsSgcJsjdBuiDedicatedAccount;
+
+/**
+ * 农民工工资专用账户Mapper接口
+ *
+ * @author kms
+ * @date 2024-06-19
+ */
+@Repository
+public interface BsSgcJsjdBuiDedicatedAccountMapper extends BaseMapper<BsSgcJsjdBuiDedicatedAccount> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.kms.build.mapper;
+
+import org.springframework.stereotype.Repository;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.kms.build.domain.BsSgcJsjdBuiRealNamePro;
+
+/**
+ * 农民工实行信息关联项目Mapper接口
+ *
+ * @author kms
+ * @date 2024-06-19
+ */
+@Repository
+public interface BsSgcJsjdBuiRealNameProMapper extends BaseMapper<BsSgcJsjdBuiRealNamePro> {
+
+}

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

@@ -42,7 +42,9 @@ public interface BsSgcjsjdBuiProInfoMapper extends BaseMapper<BsSgcjsjdBuiProInf
                                            @Param("adcd") String adcd,
                                            @Param("orderBy") String orderBy,
                                            @Param("pageNum") int pageNum,
-                                           @Param("pageSize") int pageSize);
+                                           @Param("pageSize") int pageSize,
+                                           @Param("proNo") String proNo,
+                                           @Param("proCode")String proCode);
 
     IPage<BsSgcjsjdBuiProInfo> selectManagePage(@Param("userId") String userId,
                                                 @Param("userType") String userType,

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

@@ -0,0 +1,17 @@
+package com.kms.build.service;
+
+import org.springframework.stereotype.Service;
+import com.jianwei.common.core.service.BaseService;
+import com.kms.build.mapper.BsSgcJsjdBuiDedicatedAccountMapper;
+import com.kms.build.domain.BsSgcJsjdBuiDedicatedAccount;
+
+/**
+ * 农民工工资专用账户Service接口
+ *
+ * @author kms
+ * @date 2024-06-19
+ */
+@Service
+public class BsSgcJsjdBuiDedicatedAccountService extends BaseService<BsSgcJsjdBuiDedicatedAccountMapper, BsSgcJsjdBuiDedicatedAccount>{
+
+}

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

@@ -0,0 +1,17 @@
+package com.kms.build.service;
+
+import org.springframework.stereotype.Service;
+import com.jianwei.common.core.service.BaseService;
+import com.kms.build.mapper.BsSgcJsjdBuiRealNameProMapper;
+import com.kms.build.domain.BsSgcJsjdBuiRealNamePro;
+
+/**
+ * 农民工实行信息关联项目Service接口
+ *
+ * @author kms
+ * @date 2024-06-19
+ */
+@Service
+public class BsSgcJsjdBuiRealNameProService extends BaseService<BsSgcJsjdBuiRealNameProMapper, BsSgcJsjdBuiRealNamePro>{
+
+}

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

@@ -145,10 +145,10 @@ public class BsSgcjsjdBuiProInfoService extends BaseService<BsSgcjsjdBuiProInfoM
         if (ObjectUtil.isNull(params)) {
             list = bsSgcjsjdBuiProInfoMapper.getByUserPro(sysUser.getId(), sysUser.getUserType(), data.getId(), data.getProjectName(),
                     sysXzqhService.getSubString(data.getAdcd()),
-                    "create_time", sp.getPageNum(), sp.getPageSize());
+                    "create_time", sp.getPageNum(), sp.getPageSize(),sp.getData().getProNo(),sp.getData().getProCode());
         } else {
             list = bsSgcjsjdBuiProInfoMapper.getByUserPro(sysUser.getId(), sysUser.getUserType(), data.getId(),
-                    data.getProjectName(), sysXzqhService.getSubString(data.getAdcd()), (String) params.get("orderBy"), sp.getPageNum(), sp.getPageSize());
+                    data.getProjectName(), sysXzqhService.getSubString(data.getAdcd()), (String) params.get("orderBy"), sp.getPageNum(), sp.getPageSize(),sp.getData().getProNo(),sp.getData().getProCode());
         }
 
 

jwtech-system/src/main/java/com/kms/statistics/controller/BsSgcJsjdBuiNmgStatisticsController.java

@@ -0,0 +1,24 @@
+package com.kms.statistics.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.jianwei.common.core.domain.SearchParam;
+import com.kms.build.domain.BsSgcJsjdBuiDedicatedAccount;
+import com.kms.build.domain.BsSgcJsjdBuiRealNamePro;
+import com.kms.statistics.service.BsSgcJsjdBuiNmgStatisticsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/statistics/nmg")
+public class BsSgcJsjdBuiNmgStatisticsController {
+    @Autowired
+    BsSgcJsjdBuiNmgStatisticsService bsSgcJsjdBuiNmgStatisticsService;
+
+    @GetMapping
+    public IPage<BsSgcJsjdBuiDedicatedAccount>selectPage(SearchParam<BsSgcJsjdBuiRealNamePro>sp){
+         return bsSgcJsjdBuiNmgStatisticsService.selectPage(sp);
+    }
+}

jwtech-system/src/main/java/com/kms/statistics/domain/BsSgcJsjdNmgStatisticVo.java

@@ -0,0 +1,11 @@
+package com.kms.statistics.domain;
+
+
+import lombok.Data;
+
+@Data
+public class BsSgcJsjdNmgStatisticVo {
+    private String project_name;
+
+
+}

jwtech-system/src/main/java/com/kms/statistics/service/BsSgcJsjdBuiNmgStatisticsService.java

@@ -0,0 +1,18 @@
+package com.kms.statistics.service;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jianwei.common.core.domain.SearchParam;
+import com.kms.build.domain.BsSgcJsjdBuiDedicatedAccount;
+import com.kms.build.domain.BsSgcJsjdBuiRealNamePro;
+import org.springframework.stereotype.Service;
+
+@Service
+public class BsSgcJsjdBuiNmgStatisticsService {
+
+    public IPage<BsSgcJsjdBuiDedicatedAccount> selectPage(SearchParam<BsSgcJsjdBuiRealNamePro> sp){
+        Page<BsSgcJsjdBuiRealNamePro>page=new Page<>(sp.getPageNum(),sp.getPageSize());
+        return null;
+    }
+}

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

@@ -149,6 +149,12 @@
                 <if test="projectName!=null and projectName!=''">
                     and pi.project_name like concat('%',#{projectName},'%')
                 </if>
+                <if test="proCode != null and proCode != ''">
+                    and pi.PRO_CODE=#{proCode}
+                </if>
+                <if test="proNo != null and proNo != ''">
+                    and pi.PRO_NO=#{proNo}
+                </if>
                 <include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include>
             </where>
             order by pi.${orderBy} desc LIMIT #{pageNum},#{pageSize};
@@ -158,6 +164,12 @@
                 <if test="projectName!=null and projectName!=''">
                     and pi.project_name like concat('%',#{projectName},'%')
                 </if>
+                <if test="proCode != null and proCode != ''">
+                    and pi.PRO_CODE=#{proCode}
+                </if>
+                <if test="proNo != null and proNo != ''">
+                    and pi.PRO_NO=#{proNo}
+                </if>
                 <include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include>
             </where>
             order by pi.${orderBy} desc LIMIT #{pageNum},#{pageSize};