数据采集 数据预警

zhbsq-admin/src/main/java/com/hjy/modlue/gather/CbGatherController.java

@@ -0,0 +1,89 @@
+package com.hjy.modlue.gather;
+
+import com.hjy.common.annotation.Log;
+import com.hjy.common.core.controller.BaseController;
+import com.hjy.common.core.domain.AjaxResult;
+import com.hjy.common.enums.BusinessType;
+import com.hjy.common.utils.poi.ExcelUtil;
+import com.hjy.module.service.gather.ICbGatherService;
+import com.hjy.module.vo.gather.CbGatherVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+import com.hjy.common.core.page.TableDataInfo;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 数据采集Controller
+ *
+ * @author Tellsea
+ * @date 2023-08-30
+ */
+@Api(tags = "数据采集Controller")
+@RestController
+@RequestMapping("/gather")
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+public class CbGatherController extends BaseController {
+
+    private final ICbGatherService cbGatherService;
+
+    @ApiOperation("查询数据采集列表")
+    @PreAuthorize("@ss.hasPermi('gather:GATHER:list')")
+    @GetMapping("/list")
+    public TableDataInfo<CbGatherVo> list(CbGatherVo entity) {
+        return cbGatherService.queryList(entity);
+    }
+
+    @ApiOperation("查询数据采集所有列表")
+    @GetMapping("/listAll")
+    public AjaxResult listAll(CbGatherVo entity) {
+        return AjaxResult.success("查询成功", cbGatherService.queryAll(entity));
+    }
+
+    @ApiOperation("导出数据采集列表")
+    @PreAuthorize("@ss.hasPermi('gather:GATHER:export')")
+    @Log(title = "数据采集", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CbGatherVo entity) {
+        List<CbGatherVo> list = cbGatherService.queryAll(entity);
+        ExcelUtil<CbGatherVo> util = new ExcelUtil<>(CbGatherVo.class);
+        util.exportExcel(response, list, "数据采集数据");
+    }
+
+    @ApiOperation("获取数据采集详细信息")
+    @PreAuthorize("@ss.hasPermi('gather:GATHER:query')")
+    @GetMapping(value = "/getInfo/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id) {
+        return AjaxResult.success("查询成功", cbGatherService.queryById(id));
+    }
+
+    @ApiOperation("新增数据采集")
+    @PreAuthorize("@ss.hasPermi('gather:GATHER:add')")
+    @Log(title = "数据采集", businessType = BusinessType.INSERT)
+    @PostMapping("add")
+    public AjaxResult add(@RequestBody CbGatherVo entity) {
+        return toAjax(cbGatherService.save(entity));
+    }
+
+    @ApiOperation("修改数据采集")
+    @PreAuthorize("@ss.hasPermi('gather:GATHER:edit')")
+    @Log(title = "数据采集", businessType = BusinessType.UPDATE)
+    @PostMapping("edit")
+    public AjaxResult edit(@RequestBody CbGatherVo entity) {
+        return toAjax(cbGatherService.updateById(entity));
+    }
+
+    @ApiOperation("删除数据采集")
+    @PreAuthorize("@ss.hasPermi('gather:GATHER:remove')")
+    @Log(title = "数据采集", businessType = BusinessType.DELETE)
+	@GetMapping("/remove/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids) {
+        return toAjax(cbGatherService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
+    }
+}

zhbsq-admin/src/main/java/com/hjy/modlue/gather/CbGatherFeeController.java

@@ -0,0 +1,89 @@
+package com.hjy.modlue.gather;
+
+import com.hjy.common.annotation.Log;
+import com.hjy.common.core.controller.BaseController;
+import com.hjy.common.core.domain.AjaxResult;
+import com.hjy.common.enums.BusinessType;
+import com.hjy.common.utils.poi.ExcelUtil;
+import com.hjy.module.service.gather.ICbGatherFeeService;
+import com.hjy.module.vo.gather.CbGatherFeeVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+import com.hjy.common.core.page.TableDataInfo;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 数据采集明细Controller
+ *
+ * @author Tellsea
+ * @date 2023-08-30
+ */
+@Api(tags = "数据采集明细Controller")
+@RestController
+@RequestMapping("/gather_fee")
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+public class CbGatherFeeController extends BaseController {
+
+    private final ICbGatherFeeService cbGatherFeeService;
+
+    @ApiOperation("查询数据采集明细列表")
+    @PreAuthorize("@ss.hasPermi('gather:GATHERFEE:list')")
+    @GetMapping("/list")
+    public TableDataInfo<CbGatherFeeVo> list(CbGatherFeeVo entity) {
+        return cbGatherFeeService.queryList(entity);
+    }
+
+    @ApiOperation("查询数据采集明细所有列表")
+    @GetMapping("/listAll")
+    public AjaxResult listAll(CbGatherFeeVo entity) {
+        return AjaxResult.success("查询成功", cbGatherFeeService.queryAll(entity));
+    }
+
+    @ApiOperation("导出数据采集明细列表")
+    @PreAuthorize("@ss.hasPermi('gather:GATHERFEE:export')")
+    @Log(title = "数据采集明细", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CbGatherFeeVo entity) {
+        List<CbGatherFeeVo> list = cbGatherFeeService.queryAll(entity);
+        ExcelUtil<CbGatherFeeVo> util = new ExcelUtil<>(CbGatherFeeVo.class);
+        util.exportExcel(response, list, "数据采集明细数据");
+    }
+
+    @ApiOperation("获取数据采集明细详细信息")
+    @PreAuthorize("@ss.hasPermi('gather:GATHERFEE:query')")
+    @GetMapping(value = "/getInfo/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id) {
+        return AjaxResult.success("查询成功", cbGatherFeeService.queryById(id));
+    }
+
+    @ApiOperation("新增数据采集明细")
+    @PreAuthorize("@ss.hasPermi('gather:GATHERFEE:add')")
+    @Log(title = "数据采集明细", businessType = BusinessType.INSERT)
+    @PostMapping("add")
+    public AjaxResult add(@RequestBody CbGatherFeeVo entity) {
+        return toAjax(cbGatherFeeService.save(entity));
+    }
+
+    @ApiOperation("修改数据采集明细")
+    @PreAuthorize("@ss.hasPermi('gather:GATHERFEE:edit')")
+    @Log(title = "数据采集明细", businessType = BusinessType.UPDATE)
+    @PostMapping("edit")
+    public AjaxResult edit(@RequestBody CbGatherFeeVo entity) {
+        return toAjax(cbGatherFeeService.updateById(entity));
+    }
+
+    @ApiOperation("删除数据采集明细")
+    @PreAuthorize("@ss.hasPermi('gather:GATHERFEE:remove')")
+    @Log(title = "数据采集明细", businessType = BusinessType.DELETE)
+	@GetMapping("/remove/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids) {
+        return toAjax(cbGatherFeeService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
+    }
+}

zhbsq-admin/src/main/java/com/hjy/modlue/gather/CbGatherWarningController.java

@@ -0,0 +1,89 @@
+package com.hjy.modlue.gather;
+
+import com.hjy.common.annotation.Log;
+import com.hjy.common.core.controller.BaseController;
+import com.hjy.common.core.domain.AjaxResult;
+import com.hjy.common.enums.BusinessType;
+import com.hjy.common.utils.poi.ExcelUtil;
+import com.hjy.module.service.gather.ICbGatherWarningService;
+import com.hjy.module.vo.gather.CbGatherWarningVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+import com.hjy.common.core.page.TableDataInfo;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 数据采集预警Controller
+ *
+ * @author Tellsea
+ * @date 2023-08-30
+ */
+@Api(tags = "数据采集预警Controller")
+@RestController
+@RequestMapping("/gather/WARNING")
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+public class CbGatherWarningController extends BaseController {
+
+    private final ICbGatherWarningService cbGatherWarningService;
+
+    @ApiOperation("查询数据采集预警列表")
+    @PreAuthorize("@ss.hasPermi('gather:GATHERWARNING:list')")
+    @GetMapping("/list")
+    public TableDataInfo<CbGatherWarningVo> list(CbGatherWarningVo entity) {
+        return cbGatherWarningService.queryList(entity);
+    }
+
+    @ApiOperation("查询数据采集预警所有列表")
+    @GetMapping("/listAll")
+    public AjaxResult listAll(CbGatherWarningVo entity) {
+        return AjaxResult.success("查询成功", cbGatherWarningService.queryAll(entity));
+    }
+
+    @ApiOperation("导出数据采集预警列表")
+    @PreAuthorize("@ss.hasPermi('gather:GATHERWARNING:export')")
+    @Log(title = "数据采集预警", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CbGatherWarningVo entity) {
+        List<CbGatherWarningVo> list = cbGatherWarningService.queryAll(entity);
+        ExcelUtil<CbGatherWarningVo> util = new ExcelUtil<>(CbGatherWarningVo.class);
+        util.exportExcel(response, list, "数据采集预警数据");
+    }
+
+    @ApiOperation("获取数据采集预警详细信息")
+    @PreAuthorize("@ss.hasPermi('gather:GATHERWARNING:query')")
+    @GetMapping(value = "/getInfo/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id) {
+        return AjaxResult.success("查询成功", cbGatherWarningService.queryById(id));
+    }
+
+    @ApiOperation("新增数据采集预警")
+    @PreAuthorize("@ss.hasPermi('gather:GATHERWARNING:add')")
+    @Log(title = "数据采集预警", businessType = BusinessType.INSERT)
+    @PostMapping("add")
+    public AjaxResult add(@RequestBody CbGatherWarningVo entity) {
+        return toAjax(cbGatherWarningService.save(entity));
+    }
+
+    @ApiOperation("修改数据采集预警")
+    @PreAuthorize("@ss.hasPermi('gather:GATHERWARNING:edit')")
+    @Log(title = "数据采集预警", businessType = BusinessType.UPDATE)
+    @PostMapping("edit")
+    public AjaxResult edit(@RequestBody CbGatherWarningVo entity) {
+        return toAjax(cbGatherWarningService.updateById(entity));
+    }
+
+    @ApiOperation("删除数据采集预警")
+    @PreAuthorize("@ss.hasPermi('gather:GATHERWARNING:remove')")
+    @Log(title = "数据采集预警", businessType = BusinessType.DELETE)
+	@GetMapping("/remove/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids) {
+        return toAjax(cbGatherWarningService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
+    }
+}

zhbsq-admin/src/main/java/com/hjy/modlue/norm/CbGiveController.java

@@ -0,0 +1,89 @@
+package com.hjy.modlue.norm;
+
+import com.hjy.common.annotation.Log;
+import com.hjy.common.core.controller.BaseController;
+import com.hjy.common.core.domain.AjaxResult;
+import com.hjy.common.enums.BusinessType;
+import com.hjy.common.utils.poi.ExcelUtil;
+import com.hjy.module.service.norm.ICbGiveService;
+import com.hjy.module.vo.norm.CbGiveVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+import com.hjy.common.core.page.TableDataInfo;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 报送数据项配置Controller
+ *
+ * @author Tellsea
+ * @date 2023-08-30
+ */
+@Api(tags = "报送数据项配置Controller")
+@RestController
+@RequestMapping("/norm/GIVE")
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+public class CbGiveController extends BaseController {
+
+    private final ICbGiveService cbGiveService;
+
+    @ApiOperation("查询报送数据项配置列表")
+    @PreAuthorize("@ss.hasPermi('norm:GIVE:list')")
+    @GetMapping("/list")
+    public TableDataInfo<CbGiveVo> list(CbGiveVo entity) {
+        return cbGiveService.queryList(entity);
+    }
+
+    @ApiOperation("查询报送数据项配置所有列表")
+    @GetMapping("/listAll")
+    public AjaxResult listAll(CbGiveVo entity) {
+        return AjaxResult.success("查询成功", cbGiveService.queryAll(entity));
+    }
+
+    @ApiOperation("导出报送数据项配置列表")
+    @PreAuthorize("@ss.hasPermi('norm:GIVE:export')")
+    @Log(title = "报送数据项配置", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CbGiveVo entity) {
+        List<CbGiveVo> list = cbGiveService.queryAll(entity);
+        ExcelUtil<CbGiveVo> util = new ExcelUtil<>(CbGiveVo.class);
+        util.exportExcel(response, list, "报送数据项配置数据");
+    }
+
+    @ApiOperation("获取报送数据项配置详细信息")
+    @PreAuthorize("@ss.hasPermi('norm:GIVE:query')")
+    @GetMapping(value = "/getInfo/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id) {
+        return AjaxResult.success("查询成功", cbGiveService.queryById(id));
+    }
+
+    @ApiOperation("新增报送数据项配置")
+    @PreAuthorize("@ss.hasPermi('norm:GIVE:add')")
+    @Log(title = "报送数据项配置", businessType = BusinessType.INSERT)
+    @PostMapping("add")
+    public AjaxResult add(@RequestBody CbGiveVo entity) {
+        return toAjax(cbGiveService.save(entity));
+    }
+
+    @ApiOperation("修改报送数据项配置")
+    @PreAuthorize("@ss.hasPermi('norm:GIVE:edit')")
+    @Log(title = "报送数据项配置", businessType = BusinessType.UPDATE)
+    @PostMapping("edit")
+    public AjaxResult edit(@RequestBody CbGiveVo entity) {
+        return toAjax(cbGiveService.updateById(entity));
+    }
+
+    @ApiOperation("删除报送数据项配置")
+    @PreAuthorize("@ss.hasPermi('norm:GIVE:remove')")
+    @Log(title = "报送数据项配置", businessType = BusinessType.DELETE)
+	@GetMapping("/remove/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids) {
+        return toAjax(cbGiveService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
+    }
+}

zhbsq-modlue/src/main/java/com/hjy/module/domain/gether/CbGather.java

@@ -0,0 +1,82 @@
+package com.hjy.module.domain.gether;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.hjy.common.annotation.Excel;
+import com.hjy.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+/**
+ * 数据采集对象 CB_GATHER
+ *
+ * @author Tellsea
+ * @date 2023-08-30
+ */
+@Data
+@Accessors(chain = true)
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = true)
+public class CbGather extends BaseEntity {
+
+    /**
+     * $column.columnComment
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    private String id;
+
+    /**
+     * 删除标识
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Excel(name = "删除标识")
+    private String delFlag;
+
+    /**
+     * 部门id
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Excel(name = "部门id")
+    private String deptId;
+
+    /**
+     * 数据类型(0=量化指标数据,1=月报表数据)
+     */
+    @ApiModelProperty("数据类型(0=量化指标数据,1=月报表数据)")
+    @Excel(name = "数据类型(0=量化指标数据,1=月报表数据)")
+    private String type;
+
+    /**
+     * 月份
+     */
+    @ApiModelProperty("月份")
+    @Excel(name = "月份")
+    private String month;
+
+    /**
+     * 采集状态(0=未采集,1=已采集)
+     */
+    @ApiModelProperty("采集状态(0=未采集,1=已采集)")
+    @Excel(name = "采集状态(0=未采集,1=已采集)")
+    private String collStatus;
+
+    /**
+     * 上报状态(0=未上报,=1已上报)
+     */
+    @ApiModelProperty("上报状态(0=未上报,=1已上报)")
+    @Excel(name = "上报状态(0=未上报,=1已上报)")
+    private String reportStatus;
+
+    /**
+     * 审核状态(0=未审核,1审核中,2=审核通过,3=审核拒绝)
+     */
+    @ApiModelProperty("审核状态(0=未审核,1审核中,2=审核通过,3=审核拒绝)")
+    @Excel(name = "审核状态(0=未审核,1审核中,2=审核通过,3=审核拒绝)")
+    private String approveStatus;
+
+}

zhbsq-modlue/src/main/java/com/hjy/module/domain/gether/CbGatherFee.java

@@ -0,0 +1,82 @@
+package com.hjy.module.domain.gether;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.hjy.common.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.hjy.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+/**
+ * 数据采集明细对象 CB_GATHER_FEE
+ *
+ * @author Tellsea
+ * @date 2023-08-30
+ */
+@Data
+@Accessors(chain = true)
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = true)
+public class CbGatherFee extends BaseEntity {
+
+    /**
+     * $column.columnComment
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    private String id;
+
+    /**
+     * 删除标识
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Excel(name = "删除标识")
+    private String delFlag;
+
+    /**
+     * 部门id
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Excel(name = "部门id")
+    private String deptId;
+
+    /**
+     * 指标分类id
+     */
+    @ApiModelProperty("指标分类id")
+    @Excel(name = "指标分类id")
+    private String normId;
+
+    /**
+     * 指标分类名称
+     */
+    @ApiModelProperty("指标分类名称")
+    @Excel(name = "指标分类名称")
+    private String normName;
+
+    /**
+     * 权重明细id
+     */
+    @ApiModelProperty("权重明细id")
+    @Excel(name = "权重明细id")
+    private String normfeeId;
+
+    /**
+     * 权重明细名称
+     */
+    @ApiModelProperty("权重明细名称")
+    @Excel(name = "权重明细名称")
+    private String normfeeName;
+
+    /**
+     * 采集值
+     */
+    @ApiModelProperty("采集值")
+    @Excel(name = "采集值")
+    private String collCalue;
+
+}

zhbsq-modlue/src/main/java/com/hjy/module/domain/gether/CbGatherWarning.java

@@ -0,0 +1,110 @@
+package com.hjy.module.domain.gether;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.hjy.common.annotation.Excel;
+import com.hjy.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+/**
+ * 数据采集预警对象 CB_GATHER_WARNING
+ *
+ * @author Tellsea
+ * @date 2023-08-30
+ */
+@Data
+@Accessors(chain = true)
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = true)
+public class CbGatherWarning extends BaseEntity {
+
+    /**
+     * $column.columnComment
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    private String id;
+
+    /**
+     * 删除标识
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Excel(name = "删除标识")
+    private String delFlag;
+
+    /**
+     * 部门id
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Excel(name = "部门id")
+    private String deptId;
+
+    /**
+     * 数据类型(0=量化指标数据,1=月报表数据)
+     */
+    @ApiModelProperty("数据类型(0=量化指标数据,1=月报表数据)")
+    @Excel(name = "数据类型(0=量化指标数据,1=月报表数据)")
+    private String type;
+
+    /**
+     * 异常数据id
+     */
+    @ApiModelProperty("异常数据id")
+    @Excel(name = "异常数据id")
+    private String getherId;
+
+    /**
+     * 异常详细数据id
+     */
+    @ApiModelProperty("异常详细数据id")
+    @Excel(name = "异常详细数据id")
+    private String getherfeeId;
+
+    /**
+     * 异常详细数据值
+     */
+    @ApiModelProperty("异常详细数据值")
+    @Excel(name = "异常详细数据值")
+    private String errValue;
+
+    /**
+     * 处置人
+     */
+    @ApiModelProperty("处置人")
+    @Excel(name = "处置人")
+    private String dealBy;
+
+    /**
+     * 处置时间
+     */
+    @ApiModelProperty("处置时间")
+    @Excel(name = "处置时间")
+    private String dealTime;
+
+    /**
+     * 取消人
+     */
+    @ApiModelProperty("取消人")
+    @Excel(name = "取消人")
+    private String cancelBy;
+
+    /**
+     * 取消时间
+     */
+    @ApiModelProperty("取消时间")
+    @Excel(name = "取消时间")
+    private String cancelTime;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty("备注")
+    @Excel(name = "备注")
+    private String remark;
+
+}

zhbsq-modlue/src/main/java/com/hjy/module/domain/norm/CbGive.java

@@ -0,0 +1,137 @@
+package com.hjy.module.domain.norm;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.hjy.common.annotation.Excel;
+import com.hjy.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+/**
+ * 报送数据项配置对象 CB_GIVE
+ *
+ * @author Tellsea
+ * @date 2023-08-30
+ */
+@Data
+@Accessors(chain = true)
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = true)
+public class CbGive extends BaseEntity {
+
+    /**
+     * $column.columnComment
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    private String id;
+
+    /**
+     * 删除标识
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Excel(name = "删除标识")
+    private String delFlag;
+
+    /**
+     * 部门id
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Excel(name = "部门id")
+    private String deptId;
+
+    /**
+     * 报送参数名称
+     */
+    @ApiModelProperty("报送参数名称")
+    @Excel(name = "报送参数名称")
+    private String fname;
+
+    /**
+     * 计量单位
+     */
+    @ApiModelProperty("计量单位")
+    @Excel(name = "计量单位")
+    private String funit;
+
+    /**
+     * 分类占比
+     */
+    @ApiModelProperty("分类占比")
+    @Excel(name = "分类占比")
+    private BigDecimal normRatio;
+
+    /**
+     * 权数
+     */
+    @ApiModelProperty("权数")
+    @Excel(name = "权数")
+    private BigDecimal fnumber;
+
+    /**
+     * 是否启用(1=启用,0不启用)
+     */
+    @ApiModelProperty("是否启用(1=启用,0不启用)")
+    @Excel(name = "是否启用(1=启用,0不启用)")
+    private String status;
+
+    /**
+     * 启用时间
+     */
+    @ApiModelProperty("启用时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "启用时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date startTime;
+
+    /**
+     * 停用时间
+     */
+    @ApiModelProperty("停用时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "停用时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date stopTime;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty("备注")
+    @Excel(name = "备注")
+    private String remark;
+
+    /**
+     * 采集参考值
+     */
+    @ApiModelProperty("采集参考值")
+    @Excel(name = "采集参考值")
+    private BigDecimal collValue;
+
+    /**
+     * 绩效参考值
+     */
+    @ApiModelProperty("绩效参考值")
+    @Excel(name = "绩效参考值")
+    private BigDecimal meritsValue;
+
+    /**
+     * 上下公差占比
+     */
+    @ApiModelProperty("上下公差占比")
+    @Excel(name = "上下公差占比")
+    private BigDecimal dfRetio;
+
+    /**
+     * 明细类型(1=绩效,2=采集)
+     */
+    @ApiModelProperty("明细类型(1=绩效,2=采集)")
+    @Excel(name = "明细类型(1=绩效,2=采集)")
+    private String type;
+
+}

zhbsq-modlue/src/main/java/com/hjy/module/domain/norm/CbNormFee.java

@@ -10,6 +10,9 @@ import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import lombok.experimental.Accessors;
 
+import java.math.BigDecimal;
+import java.util.Date;
+
 /**
  * 指标权重明细对象 CB_NORM_FEE
  *
@@ -54,7 +57,7 @@ public class CbNormFee extends BaseEntity {
      */
     @Excel(name = "分类占比")
     @ApiModelProperty("分类占比")
-    private String normRatio;
+    private BigDecimal normRatio;
 
     /**
      * 指标参数名称
@@ -75,7 +78,7 @@ public class CbNormFee extends BaseEntity {
      */
     @Excel(name = "权数")
     @ApiModelProperty("权数")
-    private String fnumber;
+    private BigDecimal fnumber;
 
     /**
      * 指标参数
@@ -96,14 +99,14 @@ public class CbNormFee extends BaseEntity {
      */
     @Excel(name = "启用时间")
     @ApiModelProperty("启用时间")
-    private String startTime;
+    private Date startTime;
 
     /**
      * 停用时间
      */
     @Excel(name = "停用时间")
     @ApiModelProperty("停用时间")
-    private String stopTime;
+    private Date stopTime;
 
     /**
      * 备注
@@ -117,21 +120,21 @@ public class CbNormFee extends BaseEntity {
      */
     @Excel(name = "绩效参考值")
     @ApiModelProperty("绩效参考值")
-    private String meritsValue;
+    private BigDecimal meritsValue;
 
     /**
      * 采集参考值
      */
     @Excel(name = "采集参考值")
     @ApiModelProperty("采集参考值")
-    private String collValue;
+    private BigDecimal collValue;
 
     /**
      * 上下公差占比
      */
     @Excel(name = "上下公差占比")
     @ApiModelProperty("上下公差占比")
-    private String dfRetio;
+    private BigDecimal dfRetio;
 
     /**
      * 明细类型(1=绩效,2=采集)

zhbsq-modlue/src/main/java/com/hjy/module/mapper/gather/CbGatherFeeMapper.java

@@ -0,0 +1,25 @@
+package com.hjy.module.mapper.gather;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.hjy.module.domain.gether.CbGatherFee;
+import com.hjy.module.vo.gather.CbGatherFeeVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 数据采集明细Mapper接口
+ *
+ * @author Tellsea
+ * @date 2023-08-30
+ */
+public interface CbGatherFeeMapper extends BaseMapper<CbGatherFee> {
+
+    Page<CbGatherFeeVo> queryList(Page<?> page, @Param("entity") CbGatherFeeVo entity);
+
+    List<CbGatherFeeVo> queryList(@Param("entity") CbGatherFeeVo entity);
+
+    CbGatherFeeVo queryById(@Param("id") String id);
+
+}

zhbsq-modlue/src/main/java/com/hjy/module/mapper/gather/CbGatherMapper.java

@@ -0,0 +1,25 @@
+package com.hjy.module.mapper.gather;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.hjy.module.domain.gether.CbGather;
+import com.hjy.module.vo.gather.CbGatherVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 数据采集Mapper接口
+ *
+ * @author Tellsea
+ * @date 2023-08-30
+ */
+public interface CbGatherMapper extends BaseMapper<CbGather> {
+
+    Page<CbGatherVo> queryList(Page<?> page, @Param("entity") CbGatherVo entity);
+
+    List<CbGatherVo> queryList(@Param("entity") CbGatherVo entity);
+
+    CbGatherVo queryById(@Param("id") String id);
+
+}

zhbsq-modlue/src/main/java/com/hjy/module/mapper/gather/CbGatherWarningMapper.java

@@ -0,0 +1,25 @@
+package com.hjy.module.mapper.gather;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.hjy.module.domain.gether.CbGatherWarning;
+import com.hjy.module.vo.gather.CbGatherWarningVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 数据采集预警Mapper接口
+ *
+ * @author Tellsea
+ * @date 2023-08-30
+ */
+public interface CbGatherWarningMapper extends BaseMapper<CbGatherWarning> {
+
+    Page<CbGatherWarningVo> queryList(Page<?> page, @Param("entity") CbGatherWarningVo entity);
+
+    List<CbGatherWarningVo> queryList(@Param("entity") CbGatherWarningVo entity);
+
+    CbGatherWarningVo queryById(@Param("id") String id);
+
+}

zhbsq-modlue/src/main/java/com/hjy/module/mapper/norm/CbGiveMapper.java

@@ -0,0 +1,25 @@
+package com.hjy.module.mapper.norm;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.hjy.module.domain.norm.CbGive;
+import com.hjy.module.vo.norm.CbGiveVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 报送数据项配置Mapper接口
+ *
+ * @author Tellsea
+ * @date 2023-08-30
+ */
+public interface CbGiveMapper extends BaseMapper<CbGive> {
+
+    Page<CbGiveVo> queryList(Page<?> page, @Param("entity") CbGiveVo entity);
+
+    List<CbGiveVo> queryList(@Param("entity") CbGiveVo entity);
+
+    CbGiveVo queryById(@Param("id") String id);
+
+}

zhbsq-modlue/src/main/java/com/hjy/module/service/gather/ICbGatherFeeService.java

@@ -0,0 +1,41 @@
+package com.hjy.module.service.gather;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.hjy.common.core.page.TableDataInfo;
+import com.hjy.module.domain.gether.CbGatherFee;
+import com.hjy.module.vo.gather.CbGatherFeeVo;
+
+import java.util.List;
+
+/**
+ * 数据采集明细Service接口
+ *
+ * @author Tellsea
+ * @date 2023-08-30
+ */
+public interface ICbGatherFeeService extends IService<CbGatherFee> {
+
+    /**
+     * 分页查询
+     *
+     * @param entity
+     * @return
+     */
+    TableDataInfo<CbGatherFeeVo> queryList(CbGatherFeeVo entity);
+
+    /**
+     * 查询全部
+     *
+     * @param entity
+     * @return
+     */
+    List<CbGatherFeeVo> queryAll(CbGatherFeeVo entity);
+
+    /**
+     * 根据ID查询
+     *
+     * @param id
+     * @return
+     */
+    CbGatherFeeVo queryById(String id);
+}

zhbsq-modlue/src/main/java/com/hjy/module/service/gather/ICbGatherService.java

@@ -0,0 +1,41 @@
+package com.hjy.module.service.gather;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.hjy.common.core.page.TableDataInfo;
+import com.hjy.module.domain.gether.CbGather;
+import com.hjy.module.vo.gather.CbGatherVo;
+
+import java.util.List;
+
+/**
+ * 数据采集Service接口
+ *
+ * @author Tellsea
+ * @date 2023-08-30
+ */
+public interface ICbGatherService extends IService<CbGather> {
+
+    /**
+     * 分页查询
+     *
+     * @param entity
+     * @return
+     */
+    TableDataInfo<CbGatherVo> queryList(CbGatherVo entity);
+
+    /**
+     * 查询全部
+     *
+     * @param entity
+     * @return
+     */
+    List<CbGatherVo> queryAll(CbGatherVo entity);
+
+    /**
+     * 根据ID查询
+     *
+     * @param id
+     * @return
+     */
+    CbGatherVo queryById(String id);
+}

zhbsq-modlue/src/main/java/com/hjy/module/service/gather/ICbGatherWarningService.java

@@ -0,0 +1,41 @@
+package com.hjy.module.service.gather;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.hjy.common.core.page.TableDataInfo;
+import com.hjy.module.domain.gether.CbGatherWarning;
+import com.hjy.module.vo.gather.CbGatherWarningVo;
+
+import java.util.List;
+
+/**
+ * 数据采集预警Service接口
+ *
+ * @author Tellsea
+ * @date 2023-08-30
+ */
+public interface ICbGatherWarningService extends IService<CbGatherWarning> {
+
+    /**
+     * 分页查询
+     *
+     * @param entity
+     * @return
+     */
+    TableDataInfo<CbGatherWarningVo> queryList(CbGatherWarningVo entity);
+
+    /**
+     * 查询全部
+     *
+     * @param entity
+     * @return
+     */
+    List<CbGatherWarningVo> queryAll(CbGatherWarningVo entity);
+
+    /**
+     * 根据ID查询
+     *
+     * @param id
+     * @return
+     */
+    CbGatherWarningVo queryById(String id);
+}

zhbsq-modlue/src/main/java/com/hjy/module/service/gather/impl/CbGatherFeeServiceImpl.java

@@ -0,0 +1,37 @@
+package com.hjy.module.service.gather.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.hjy.common.core.page.TableDataInfo;
+import com.hjy.common.utils.PageUtils;
+import com.hjy.module.domain.gether.CbGatherFee;
+import com.hjy.module.mapper.gather.CbGatherFeeMapper;
+import com.hjy.module.service.gather.ICbGatherFeeService;
+import com.hjy.module.vo.gather.CbGatherFeeVo;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 数据采集明细Service业务层处理
+ *
+ * @author Tellsea
+ * @date 2023-08-30
+ */
+@Service
+public class CbGatherFeeServiceImpl extends ServiceImpl<CbGatherFeeMapper, CbGatherFee> implements ICbGatherFeeService {
+
+    @Override
+    public TableDataInfo<CbGatherFeeVo> queryList(CbGatherFeeVo entity) {
+        return PageUtils.buildDataInfo(this.baseMapper.queryList(PageUtils.buildPage(), entity));
+    }
+
+    @Override
+    public List<CbGatherFeeVo> queryAll(CbGatherFeeVo entity) {
+        return this.baseMapper.queryList(entity);
+    }
+
+    @Override
+    public CbGatherFeeVo queryById(String id) {
+        return this.baseMapper.queryById(id);
+    }
+}

zhbsq-modlue/src/main/java/com/hjy/module/service/gather/impl/CbGatherServiceImpl.java

@@ -0,0 +1,37 @@
+package com.hjy.module.service.gather.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.hjy.common.core.page.TableDataInfo;
+import com.hjy.common.utils.PageUtils;
+import com.hjy.module.domain.gether.CbGather;
+import com.hjy.module.mapper.gather.CbGatherMapper;
+import com.hjy.module.service.gather.ICbGatherService;
+import com.hjy.module.vo.gather.CbGatherVo;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 数据采集Service业务层处理
+ *
+ * @author Tellsea
+ * @date 2023-08-30
+ */
+@Service
+public class CbGatherServiceImpl extends ServiceImpl<CbGatherMapper, CbGather> implements ICbGatherService {
+
+    @Override
+    public TableDataInfo<CbGatherVo> queryList(CbGatherVo entity) {
+        return PageUtils.buildDataInfo(this.baseMapper.queryList(PageUtils.buildPage(), entity));
+    }
+
+    @Override
+    public List<CbGatherVo> queryAll(CbGatherVo entity) {
+        return this.baseMapper.queryList(entity);
+    }
+
+    @Override
+    public CbGatherVo queryById(String id) {
+        return this.baseMapper.queryById(id);
+    }
+}

zhbsq-modlue/src/main/java/com/hjy/module/service/gather/impl/CbGatherWarningServiceImpl.java

@@ -0,0 +1,37 @@
+package com.hjy.module.service.gather.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.hjy.common.core.page.TableDataInfo;
+import com.hjy.common.utils.PageUtils;
+import com.hjy.module.domain.gether.CbGatherWarning;
+import com.hjy.module.mapper.gather.CbGatherWarningMapper;
+import com.hjy.module.service.gather.ICbGatherWarningService;
+import com.hjy.module.vo.gather.CbGatherWarningVo;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 数据采集预警Service业务层处理
+ *
+ * @author Tellsea
+ * @date 2023-08-30
+ */
+@Service
+public class CbGatherWarningServiceImpl extends ServiceImpl<CbGatherWarningMapper, CbGatherWarning> implements ICbGatherWarningService {
+
+    @Override
+    public TableDataInfo<CbGatherWarningVo> queryList(CbGatherWarningVo entity) {
+        return PageUtils.buildDataInfo(this.baseMapper.queryList(PageUtils.buildPage(), entity));
+    }
+
+    @Override
+    public List<CbGatherWarningVo> queryAll(CbGatherWarningVo entity) {
+        return this.baseMapper.queryList(entity);
+    }
+
+    @Override
+    public CbGatherWarningVo queryById(String id) {
+        return this.baseMapper.queryById(id);
+    }
+}

zhbsq-modlue/src/main/java/com/hjy/module/service/norm/ICbGiveService.java

@@ -0,0 +1,41 @@
+package com.hjy.module.service.norm;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.hjy.common.core.page.TableDataInfo;
+import com.hjy.module.domain.norm.CbGive;
+import com.hjy.module.vo.norm.CbGiveVo;
+
+import java.util.List;
+
+/**
+ * 报送数据项配置Service接口
+ *
+ * @author Tellsea
+ * @date 2023-08-30
+ */
+public interface ICbGiveService extends IService<CbGive> {
+
+    /**
+     * 分页查询
+     *
+     * @param entity
+     * @return
+     */
+    TableDataInfo<CbGiveVo> queryList(CbGiveVo entity);
+
+    /**
+     * 查询全部
+     *
+     * @param entity
+     * @return
+     */
+    List<CbGiveVo> queryAll(CbGiveVo entity);
+
+    /**
+     * 根据ID查询
+     *
+     * @param id
+     * @return
+     */
+    CbGiveVo queryById(String id);
+}

zhbsq-modlue/src/main/java/com/hjy/module/service/norm/impl/CbGiveServiceImpl.java

@@ -0,0 +1,37 @@
+package com.hjy.module.service.norm.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.hjy.common.core.page.TableDataInfo;
+import com.hjy.common.utils.PageUtils;
+import com.hjy.module.domain.norm.CbGive;
+import com.hjy.module.mapper.norm.CbGiveMapper;
+import com.hjy.module.service.norm.ICbGiveService;
+import com.hjy.module.vo.norm.CbGiveVo;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 报送数据项配置Service业务层处理
+ *
+ * @author Tellsea
+ * @date 2023-08-30
+ */
+@Service
+public class CbGiveServiceImpl extends ServiceImpl<CbGiveMapper, CbGive> implements ICbGiveService {
+
+    @Override
+    public TableDataInfo<CbGiveVo> queryList(CbGiveVo entity) {
+        return PageUtils.buildDataInfo(this.baseMapper.queryList(PageUtils.buildPage(), entity));
+    }
+
+    @Override
+    public List<CbGiveVo> queryAll(CbGiveVo entity) {
+        return this.baseMapper.queryList(entity);
+    }
+
+    @Override
+    public CbGiveVo queryById(String id) {
+        return this.baseMapper.queryById(id);
+    }
+}

zhbsq-modlue/src/main/java/com/hjy/module/vo/gather/CbGatherFeeVo.java

@@ -0,0 +1,21 @@
+package com.hjy.module.vo.gather;
+
+import com.hjy.module.domain.gether.CbGatherFee;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+/**
+ * 数据采集明细Vo对象 CB_GATHER_FEE
+ *
+ * @author Tellsea
+ * @date 2023-08-30
+ */
+@Data
+@Accessors(chain = true)
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = true)
+public class CbGatherFeeVo extends CbGatherFee {
+
+}

zhbsq-modlue/src/main/java/com/hjy/module/vo/gather/CbGatherVo.java

@@ -0,0 +1,21 @@
+package com.hjy.module.vo.gather;
+
+import com.hjy.module.domain.gether.CbGather;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+/**
+ * 数据采集Vo对象 CB_GATHER
+ *
+ * @author Tellsea
+ * @date 2023-08-30
+ */
+@Data
+@Accessors(chain = true)
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = true)
+public class CbGatherVo extends CbGather {
+
+}

zhbsq-modlue/src/main/java/com/hjy/module/vo/gather/CbGatherWarningVo.java

@@ -0,0 +1,21 @@
+package com.hjy.module.vo.gather;
+
+import com.hjy.module.domain.gether.CbGatherWarning;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+/**
+ * 数据采集预警Vo对象 CB_GATHER_WARNING
+ *
+ * @author Tellsea
+ * @date 2023-08-30
+ */
+@Data
+@Accessors(chain = true)
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = true)
+public class CbGatherWarningVo extends CbGatherWarning {
+
+}

zhbsq-modlue/src/main/java/com/hjy/module/vo/norm/CbGiveVo.java

@@ -0,0 +1,24 @@
+package com.hjy.module.vo.norm;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.hjy.module.domain.norm.CbGive;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+/**
+ * 报送数据项配置Vo对象 CB_GIVE
+ *
+ * @author Tellsea
+ * @date 2023-08-30
+ */
+@Data
+@Accessors(chain = true)
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = true)
+public class CbGiveVo extends CbGive {
+
+}

zhbsq-modlue/src/main/resources/mapper/gather/CbGatherFeeMapper.xml

@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hjy.module.mapper.gather.CbGatherFeeMapper">
+
+    <sql id="querySql">
+        select <include refid="allField"/>
+        from CB_GATHER_FEE A
+        <include refid="search"/>
+    </sql>
+
+    <select id="queryList" resultType="com.hjy.module.vo.gather.CbGatherFeeVo">
+        <include refid="querySql"/>
+        <if test="entity.id != null and entity.id != ''">
+            and A.ID like concat('%', #{entity.id}, '%')
+        </if>
+        <if test="entity.createTime != null and entity.createTime != ''">
+            and A.CREATE_TIME like concat('%', #{entity.createTime}, '%')
+        </if>
+        <if test="entity.createBy != null and entity.createBy != ''">
+            and A.CREATE_BY like concat('%', #{entity.createBy}, '%')
+        </if>
+        <if test="entity.updateTime != null and entity.updateTime != ''">
+            and A.UPDATE_TIME like concat('%', #{entity.updateTime}, '%')
+        </if>
+        <if test="entity.updateBy != null and entity.updateBy != ''">
+            and A.UPDATE_BY like concat('%', #{entity.updateBy}, '%')
+        </if>
+        <if test="entity.delFlag != null and entity.delFlag != ''">
+            and A.DEL_FLAG like concat('%', #{entity.delFlag}, '%')
+        </if>
+        <if test="entity.deptId != null and entity.deptId != ''">
+            and A.DEPT_ID like concat('%', #{entity.deptId}, '%')
+        </if>
+        <if test="entity.normId != null and entity.normId != ''">
+            and A.NORM_ID like concat('%', #{entity.normId}, '%')
+        </if>
+        <if test="entity.normName != null and entity.normName != ''">
+            and A.NORM_NAME like concat('%', #{entity.normName}, '%')
+        </if>
+        <if test="entity.normfeeId != null and entity.normfeeId != ''">
+            and A.NORMFEE_ID like concat('%', #{entity.normfeeId}, '%')
+        </if>
+        <if test="entity.normfeeName != null and entity.normfeeName != ''">
+            and A.NORMFEE_NAME like concat('%', #{entity.normfeeName}, '%')
+        </if>
+        <if test="entity.collCalue != null and entity.collCalue != ''">
+            and A.COLL_CALUE like concat('%', #{entity.collCalue}, '%')
+        </if>
+        order by A.create_time desc
+    </select>
+
+    <select id="queryById" resultType="com.hjy.module.vo.gather.CbGatherFeeVo">
+        <include refid="querySql"/>
+        and A.id = #{id}
+    </select>
+
+    <sql id="allField">
+        A.ID,
+        A.CREATE_TIME,
+        A.CREATE_BY,
+        A.UPDATE_TIME,
+        A.UPDATE_BY,
+        A.DEL_FLAG,
+        A.DEPT_ID,
+        A.NORM_ID,
+        A.NORM_NAME,
+        A.NORMFEE_ID,
+        A.NORMFEE_NAME,
+        A.COLL_CALUE
+    </sql>
+
+    <sql id="search">
+        where A.del_flag = 0
+    </sql>
+</mapper>

zhbsq-modlue/src/main/resources/mapper/gather/CbGatherMapper.xml

@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hjy.module.mapper.gather.CbGatherMapper">
+
+    <sql id="querySql">
+        select <include refid="allField"/>
+        from CB_GATHER A
+        <include refid="search"/>
+    </sql>
+
+    <select id="queryList" resultType="com.hjy.module.vo.gather.CbGatherVo">
+        <include refid="querySql"/>
+        <if test="entity.id != null and entity.id != ''">
+            and A.ID like concat('%', #{entity.id}, '%')
+        </if>
+        <if test="entity.createTime != null and entity.createTime != ''">
+            and A.CREATE_TIME like concat('%', #{entity.createTime}, '%')
+        </if>
+        <if test="entity.createBy != null and entity.createBy != ''">
+            and A.CREATE_BY like concat('%', #{entity.createBy}, '%')
+        </if>
+        <if test="entity.updateTime != null and entity.updateTime != ''">
+            and A.UPDATE_TIME like concat('%', #{entity.updateTime}, '%')
+        </if>
+        <if test="entity.updateBy != null and entity.updateBy != ''">
+            and A.UPDATE_BY like concat('%', #{entity.updateBy}, '%')
+        </if>
+        <if test="entity.delFlag != null and entity.delFlag != ''">
+            and A.DEL_FLAG like concat('%', #{entity.delFlag}, '%')
+        </if>
+        <if test="entity.deptId != null and entity.deptId != ''">
+            and A.DEPT_ID like concat('%', #{entity.deptId}, '%')
+        </if>
+        <if test="entity.type != null and entity.type != ''">
+            and A.TYPE like concat('%', #{entity.type}, '%')
+        </if>
+        <if test="entity.month != null and entity.month != ''">
+            and A.MONTH like concat('%', #{entity.month}, '%')
+        </if>
+        <if test="entity.collStatus != null and entity.collStatus != ''">
+            and A.COLL_STATUS like concat('%', #{entity.collStatus}, '%')
+        </if>
+        <if test="entity.reportStatus != null and entity.reportStatus != ''">
+            and A.REPORT_STATUS like concat('%', #{entity.reportStatus}, '%')
+        </if>
+        <if test="entity.approveStatus != null and entity.approveStatus != ''">
+            and A.APPROVE_STATUS like concat('%', #{entity.approveStatus}, '%')
+        </if>
+        order by A.create_time desc
+    </select>
+
+    <select id="queryById" resultType="com.hjy.module.vo.gather.CbGatherVo">
+        <include refid="querySql"/>
+        and A.id = #{id}
+    </select>
+
+    <sql id="allField">
+        A.ID,
+        A.CREATE_TIME,
+        A.CREATE_BY,
+        A.UPDATE_TIME,
+        A.UPDATE_BY,
+        A.DEL_FLAG,
+        A.DEPT_ID,
+        A.TYPE,
+        A.MONTH,
+        A.COLL_STATUS,
+        A.REPORT_STATUS,
+        A.APPROVE_STATUS
+    </sql>
+
+    <sql id="search">
+        where A.del_flag = 0
+    </sql>
+</mapper>

zhbsq-modlue/src/main/resources/mapper/gather/CbGatherWarningMapper.xml

@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hjy.module.mapper.gather.CbGatherWarningMapper">
+
+    <sql id="querySql">
+        select <include refid="allField"/>
+        from CB_GATHER_WARNING A
+        <include refid="search"/>
+    </sql>
+
+    <select id="queryList" resultType="com.hjy.module.vo.gather.CbGatherWarningVo">
+        <include refid="querySql"/>
+        <if test="entity.id != null and entity.id != ''">
+            and A.ID like concat('%', #{entity.id}, '%')
+        </if>
+        <if test="entity.createTime != null and entity.createTime != ''">
+            and A.CREATE_TIME like concat('%', #{entity.createTime}, '%')
+        </if>
+        <if test="entity.createBy != null and entity.createBy != ''">
+            and A.CREATE_BY like concat('%', #{entity.createBy}, '%')
+        </if>
+        <if test="entity.updateTime != null and entity.updateTime != ''">
+            and A.UPDATE_TIME like concat('%', #{entity.updateTime}, '%')
+        </if>
+        <if test="entity.updateBy != null and entity.updateBy != ''">
+            and A.UPDATE_BY like concat('%', #{entity.updateBy}, '%')
+        </if>
+        <if test="entity.delFlag != null and entity.delFlag != ''">
+            and A.DEL_FLAG like concat('%', #{entity.delFlag}, '%')
+        </if>
+        <if test="entity.deptId != null and entity.deptId != ''">
+            and A.DEPT_ID like concat('%', #{entity.deptId}, '%')
+        </if>
+        <if test="entity.type != null and entity.type != ''">
+            and A.TYPE like concat('%', #{entity.type}, '%')
+        </if>
+        <if test="entity.getherId != null and entity.getherId != ''">
+            and A.GETHER_ID like concat('%', #{entity.getherId}, '%')
+        </if>
+        <if test="entity.getherfeeId != null and entity.getherfeeId != ''">
+            and A.GETHERFEE_ID like concat('%', #{entity.getherfeeId}, '%')
+        </if>
+        <if test="entity.errValue != null and entity.errValue != ''">
+            and A.ERR_VALUE like concat('%', #{entity.errValue}, '%')
+        </if>
+        <if test="entity.dealBy != null and entity.dealBy != ''">
+            and A.DEAL_BY like concat('%', #{entity.dealBy}, '%')
+        </if>
+        <if test="entity.dealTime != null and entity.dealTime != ''">
+            and A.DEAL_TIME like concat('%', #{entity.dealTime}, '%')
+        </if>
+        <if test="entity.cancelBy != null and entity.cancelBy != ''">
+            and A.CANCEL_BY like concat('%', #{entity.cancelBy}, '%')
+        </if>
+        <if test="entity.cancelTime != null and entity.cancelTime != ''">
+            and A.CANCEL_TIME like concat('%', #{entity.cancelTime}, '%')
+        </if>
+        <if test="entity.remark != null and entity.remark != ''">
+            and A.REMARK like concat('%', #{entity.remark}, '%')
+        </if>
+        order by A.create_time desc
+    </select>
+
+    <select id="queryById" resultType="com.hjy.module.vo.gather.CbGatherWarningVo">
+        <include refid="querySql"/>
+        and A.id = #{id}
+    </select>
+
+    <sql id="allField">
+        A.ID,
+        A.CREATE_TIME,
+        A.CREATE_BY,
+        A.UPDATE_TIME,
+        A.UPDATE_BY,
+        A.DEL_FLAG,
+        A.DEPT_ID,
+        A.TYPE,
+        A.GETHER_ID,
+        A.GETHERFEE_ID,
+        A.ERR_VALUE,
+        A.DEAL_BY,
+        A.DEAL_TIME,
+        A.CANCEL_BY,
+        A.CANCEL_TIME,
+        A.REMARK
+    </sql>
+
+    <sql id="search">
+        where A.del_flag = 1
+    </sql>
+</mapper>

zhbsq-modlue/src/main/resources/mapper/norm/CbGiveMapper.xml

@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hjy.module.mapper.norm.CbGiveMapper">
+
+    <sql id="querySql">
+        select <include refid="allField"/>
+        from CB_GIVE A
+        <include refid="search"/>
+    </sql>
+
+    <select id="queryList" resultType="com.hjy.module.vo.norm.CbGiveVo">
+        <include refid="querySql"/>
+        <if test="entity.id != null and entity.id != ''">
+            and A.ID like concat('%', #{entity.id}, '%')
+        </if>
+        <if test="entity.createTime != null and entity.createTime != 0">
+            and A.CREATE_TIME = #{entity.createTime}
+        </if>
+        <if test="entity.createBy != null and entity.createBy != ''">
+            and A.CREATE_BY like concat('%', #{entity.createBy}, '%')
+        </if>
+        <if test="entity.updateTime != null and entity.updateTime != 0">
+            and A.UPDATE_TIME = #{entity.updateTime}
+        </if>
+        <if test="entity.updateBy != null and entity.updateBy != ''">
+            and A.UPDATE_BY like concat('%', #{entity.updateBy}, '%')
+        </if>
+        <if test="entity.delFlag != null and entity.delFlag != ''">
+            and A.DEL_FLAG like concat('%', #{entity.delFlag}, '%')
+        </if>
+        <if test="entity.deptId != null and entity.deptId != ''">
+            and A.DEPT_ID like concat('%', #{entity.deptId}, '%')
+        </if>
+        <if test="entity.fname != null and entity.fname != ''">
+            and A.FNAME like concat('%', #{entity.fname}, '%')
+        </if>
+        <if test="entity.funit != null and entity.funit != ''">
+            and A.FUNIT like concat('%', #{entity.funit}, '%')
+        </if>
+        <if test="entity.normRatio != null and entity.normRatio != 0">
+            and A.NORM_RATIO = #{entity.normRatio}
+        </if>
+        <if test="entity.fnumber != null and entity.fnumber != 0">
+            and A.FNUMBER = #{entity.fnumber}
+        </if>
+        <if test="entity.status != null and entity.status != ''">
+            and A.STATUS like concat('%', #{entity.status}, '%')
+        </if>
+        <if test="entity.startTime != null and entity.startTime != 0">
+            and A.START_TIME = #{entity.startTime}
+        </if>
+        <if test="entity.stopTime != null and entity.stopTime != 0">
+            and A.STOP_TIME = #{entity.stopTime}
+        </if>
+        <if test="entity.remark != null and entity.remark != ''">
+            and A.REMARK like concat('%', #{entity.remark}, '%')
+        </if>
+        <if test="entity.collValue != null and entity.collValue != 0">
+            and A.COLL_VALUE = #{entity.collValue}
+        </if>
+        <if test="entity.meritsValue != null and entity.meritsValue != 0">
+            and A.MERITS_VALUE = #{entity.meritsValue}
+        </if>
+        <if test="entity.dfRetio != null and entity.dfRetio != 0">
+            and A.DF_RETIO = #{entity.dfRetio}
+        </if>
+        <if test="entity.type != null and entity.type != ''">
+            and A.TYPE like concat('%', #{entity.type}, '%')
+        </if>
+        order by A.create_time desc
+    </select>
+
+    <select id="queryById" resultType="com.hjy.module.vo.norm.CbGiveVo">
+        <include refid="querySql"/>
+        and A.id = #{id}
+    </select>
+
+    <sql id="allField">
+        A.ID,
+        A.CREATE_TIME,
+        A.CREATE_BY,
+        A.UPDATE_TIME,
+        A.UPDATE_BY,
+        A.DEL_FLAG,
+        A.DEPT_ID,
+        A.FNAME,
+        A.FUNIT,
+        A.NORM_RATIO,
+        A.FNUMBER,
+        A.STATUS,
+        A.START_TIME,
+        A.STOP_TIME,
+        A.REMARK,
+        A.COLL_VALUE,
+        A.MERITS_VALUE,
+        A.DF_RETIO,
+        A.TYPE
+    </sql>
+
+    <sql id="search">
+        where A.del_flag = 0
+    </sql>
+</mapper>