Merge branch 'develop' of https://gitee.com/lmlz_0/manage into develop

lzbi-generator/src/main/java/com/lzbi/generator/util/GenUtils.java

@@ -217,7 +217,7 @@ public class GenUtils
      */
     public static String replaceText(String text)
     {
-        return RegExUtils.replaceAll(text, "(?:表|若依)", "");
+        return RegExUtils.replaceAll(text, "(?:表|联美)", "");
     }
 
     /**

lzbi-generator/src/main/java/com/lzbi/generator/util/VelocityUtils.java

@@ -175,11 +175,11 @@ public class VelocityUtils
 
         if (template.contains("domain.java.vm"))
         {
-            fileName = StringUtils.format("{}/domain/{}Dao.java", javaPath, className);
+            fileName = StringUtils.format("{}/domain/{}.java", javaPath, className);
         }
         if (template.contains("sub-domain.java.vm") && StringUtils.equals(GenConstants.TPL_SUB, genTable.getTplCategory()))
         {
-            fileName = StringUtils.format("{}/domain/{}Dao.java", javaPath, genTable.getSubTable().getClassName());
+            fileName = StringUtils.format("{}/domain/{}.java", javaPath, genTable.getSubTable().getClassName());
         }
         else if (template.contains("mapper.java.vm"))
         {

lzbi-generator/src/main/resources/vm/java/controller.java.vm

@@ -1,5 +1,7 @@
 package ${packageName}.controller;
-
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -50,13 +52,13 @@ public class ${ClassName}Controller extends BaseController
     public TableDataInfo list(${ClassName} ${ClassName})
     {
         startPage();
-        List< ${ClassName}> list = ${className}Service.select ${ClassName}List(${ClassName});
+        List< ${ClassName}> list = ${className}Service.select${ClassName}List(${ClassName});
         return getDataTable(list);
     }
 #elseif($table.tree)
     public AjaxResult list(${ClassName} ${ClassName})
     {
-        List< ${ClassName}> list = ${className}Service.select ${ClassName}List(${ClassName});
+        List< ${ClassName}> list = ${className}Service.select${ClassName}List(${ClassName});
         return success(list);
     }
 #end
@@ -71,10 +73,10 @@ public class ${ClassName}Controller extends BaseController
     @PreAuthorize("@ss.hasPermi('${permissionPrefix}:export')")
     @Log(title = "${functionName}", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, ${ClassName} ${ClassName})
+    public void export(HttpServletResponse response,${ClassName} ${ClassName})
     {
-        List< ${ClassName}> list = ${className}Service.select ${ClassName}List(${ClassName});
+        List<${ClassName}> list = ${className}Service.select${ClassName}List(${ClassName});
-        ExcelUtil< ${ClassName}> util = new ExcelUtil<(${ClassName}>(${ClassName}.class);
+        ExcelUtil<${ClassName}> util = new ExcelUtil<${ClassName}>(${ClassName}.class);
         util.exportExcel(response, list, "${functionName}数据");
     }
 

lzbi-module/src/main/java/com/lzbi/code/controller/DcBusiCoderuleConfigController.java

@@ -0,0 +1,131 @@
+package com.lzbi.code.controller;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+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.lzbi.common.annotation.Log;
+import com.lzbi.common.core.controller.BaseController;
+import com.lzbi.common.core.domain.AjaxResult;
+import com.lzbi.common.enums.BusinessType;
+import com.lzbi.code.domain. DcBusiCoderuleConfig;
+import com.lzbi.code.service.DcBusiCoderuleConfigService;
+import com.lzbi.common.utils.poi.ExcelUtil;
+import com.lzbi.common.core.page.TableDataInfo;
+
+/**
+ * 业务编码配置Controller
+ * 
+ * @author zhousq
+ * @date 2023-12-06
+ */
+@RestController
+@RequestMapping("/asset/busiCodeConfig")
+public class DcBusiCoderuleConfigController extends BaseController
+{
+    @Autowired
+    private DcBusiCoderuleConfigService dcBusiCoderuleConfigService;
+
+    /**
+     * 查询业务编码配置列表
+     */
+    @ApiOperation("查询业务编码配置列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "DcBusiCoderuleConfig", value = "", dataType = "DcBusiCoderuleConfig", dataTypeClass = DcBusiCoderuleConfig.class),
+    })
+    @PreAuthorize("@ss.hasPermi('asset:busiCodeConfig:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(DcBusiCoderuleConfig DcBusiCoderuleConfig)
+    {
+        startPage();
+        List< DcBusiCoderuleConfig> list = dcBusiCoderuleConfigService.selectDcBusiCoderuleConfigList(DcBusiCoderuleConfig);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出业务编码配置列表
+     */
+    @ApiOperation("导出业务编码配置列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "DcBusiCoderuleConfig", value = "", dataType = "DcBusiCoderuleConfig", dataTypeClass = DcBusiCoderuleConfig.class),
+    })
+    @PreAuthorize("@ss.hasPermi('asset:busiCodeConfig:export')")
+    @Log(title = "业务编码配置", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response,DcBusiCoderuleConfig DcBusiCoderuleConfig)
+    {
+        List<DcBusiCoderuleConfig> list = dcBusiCoderuleConfigService.selectDcBusiCoderuleConfigList(DcBusiCoderuleConfig);
+        ExcelUtil<DcBusiCoderuleConfig> util = new ExcelUtil<DcBusiCoderuleConfig>(DcBusiCoderuleConfig.class);
+        util.exportExcel(response, list, "业务编码配置数据");
+    }
+
+    /**
+     * 获取业务编码配置详细信息
+     */
+    @ApiOperation("获取业务编码配置详细信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "", dataType = "Long", dataTypeClass = Long.class),
+    })
+    @PreAuthorize("@ss.hasPermi('asset:busiCodeConfig:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(dcBusiCoderuleConfigService.selectDcBusiCoderuleConfigById(id));
+    }
+
+    /**
+     * 新增业务编码配置
+     */
+    @ApiOperation("新增业务编码配置")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "DcBusiCoderuleConfig", value = "", dataType = "DcBusiCoderuleConfig", dataTypeClass = DcBusiCoderuleConfig.class),
+    })
+    @PreAuthorize("@ss.hasPermi('asset:busiCodeConfig:add')")
+    @Log(title = "业务编码配置", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody DcBusiCoderuleConfig DcBusiCoderuleConfig)
+    {
+        return toAjax(dcBusiCoderuleConfigService.insertDcBusiCoderuleConfig(DcBusiCoderuleConfig));
+    }
+
+    /**
+     * 修改业务编码配置
+     */
+
+    @ApiOperation("修改业务编码配置")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "DcBusiCoderuleConfig", value = "", dataType = "DcBusiCoderuleConfig", dataTypeClass = DcBusiCoderuleConfig.class),
+    })
+    @PreAuthorize("@ss.hasPermi('asset:busiCodeConfig:edit')")
+    @Log(title = "业务编码配置", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody DcBusiCoderuleConfig DcBusiCoderuleConfig)
+    {
+        return toAjax(dcBusiCoderuleConfigService.updateDcBusiCoderuleConfig(DcBusiCoderuleConfig));
+    }
+
+    /**
+     * 删除业务编码配置
+     */
+    @ApiOperation("删除业务编码配置")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "ids", value = "", dataType = "Long", dataTypeClass =Long.class),
+    })
+    @PreAuthorize("@ss.hasPermi('asset:busiCodeConfig:remove')")
+    @Log(title = "业务编码配置", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(dcBusiCoderuleConfigService.deleteDcBusiCoderuleConfigByIds(ids));
+    }
+}

lzbi-module/src/main/java/com/lzbi/code/domain/DcBaseCoderuleDefine.java

@@ -0,0 +1,62 @@
+package com.lzbi.code.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import lombok.Data;
+import com.lzbi.common.annotation.Excel;
+import com.lzbi.module.base.BaseModuleEntity;
+
+/**
+ * 编码规则定义对象 dc_base_coderule_define
+ * 
+ * @author zhousq
+ * @date 2023-12-06
+ */
+@Data
+public class DcBaseCoderuleDefine extends BaseModuleEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 创建人 */
+    private String createdBy;
+
+    /** 创建时间 */
+    private Date createdTime;
+
+    /** 更新人 */
+    private String updatedBy;
+
+    /** 更新时间 */
+    private Date updatedTime;
+
+    /** 配置ID */
+    @Excel(name = "配置ID")
+    private Long id;
+
+    /** 配置名称 */
+    @Excel(name = "配置名称")
+    private String codeConfigName;
+
+    /** 编码头 */
+    @Excel(name = "编码头")
+    private String codeHeader;
+
+    /** 编码体 */
+    @Excel(name = "编码体")
+    private String codeBody;
+
+    /** 编码体类型 */
+    @Excel(name = "编码体类型")
+    private String codeBodyType;
+
+    /** 流水号长度 */
+    @Excel(name = "流水号长度")
+    private Long codeSerialLength;
+
+    /** 分割符 */
+    @Excel(name = "分割符")
+    private String codeSplitFlag;
+
+}

lzbi-module/src/main/java/com/lzbi/code/domain/DcBusiCoderuleConfig.java

@@ -0,0 +1,53 @@
+package com.lzbi.code.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import lombok.Data;
+import com.lzbi.common.annotation.Excel;
+import com.lzbi.module.base.BaseModuleEntity;
+
+/**
+ * 业务编码配置对象 dc_busi_coderule_config
+ * 
+ * @author zhousq
+ * @date 2023-12-06
+ */
+@Data
+public class DcBusiCoderuleConfig extends BaseModuleEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 创建人 */
+    private String createdBy;
+
+    /** 创建时间 */
+    private Date createdTime;
+
+    /** 更新人 */
+    private String updatedBy;
+
+    /** 更新时间 */
+    private Date updatedTime;
+
+    /** 主键 */
+    private Long id;
+
+    /** 配置名称 */
+    @Excel(name = "配置名称")
+    private String configName;
+
+    /** 业务代码 */
+    @Excel(name = "业务代码")
+    private String nodeCode;
+
+    /** 字段名称 */
+    @Excel(name = "字段名称")
+    private String columnName;
+
+    /** 规则ID */
+    @Excel(name = "规则ID")
+    private Long ruleId;
+
+}

lzbi-module/src/main/java/com/lzbi/code/mapper/DcBusiCoderuleConfigMapper.java

@@ -0,0 +1,63 @@
+package com.lzbi.code.mapper;
+
+import java.util.List;
+import com.lzbi.code.domain.DcBusiCoderuleConfig;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 业务编码配置Mapper接口
+ * 
+ * @author zhousq
+ * @date 2023-12-06
+ */
+
+public interface DcBusiCoderuleConfigMapper extends BaseMapper<DcBusiCoderuleConfig>
+{
+    /**
+     * 查询业务编码配置
+     * 
+     * @param id 业务编码配置主键
+     * @return 业务编码配置
+     */
+    public DcBusiCoderuleConfig selectDcBusiCoderuleConfigById(Long id);
+
+    /**
+     * 查询业务编码配置列表
+     * 
+     * @param dcBusiCoderuleConfig 业务编码配置
+     * @return 业务编码配置集合
+     */
+    public List<DcBusiCoderuleConfig> selectDcBusiCoderuleConfigList(DcBusiCoderuleConfig dcBusiCoderuleConfig);
+
+    /**
+     * 新增业务编码配置
+     * 
+     * @param dcBusiCoderuleConfig 业务编码配置
+     * @return 结果
+     */
+    public int insertDcBusiCoderuleConfig(DcBusiCoderuleConfig dcBusiCoderuleConfig);
+
+    /**
+     * 修改业务编码配置
+     * 
+     * @param dcBusiCoderuleConfig 业务编码配置
+     * @return 结果
+     */
+    public int updateDcBusiCoderuleConfig(DcBusiCoderuleConfig dcBusiCoderuleConfig);
+
+    /**
+     * 删除业务编码配置
+     * 
+     * @param id 业务编码配置主键
+     * @return 结果
+     */
+    public int deleteDcBusiCoderuleConfigById(Long id);
+
+    /**
+     * 批量删除业务编码配置
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteDcBusiCoderuleConfigByIds(Long[] ids);
+}

lzbi-module/src/main/java/com/lzbi/code/service/CodeNoGenerater.java

@@ -35,6 +35,7 @@ public class CodeNoGenerater {
             StringBuilder codeBuffer=new StringBuilder();
             //
             String spitChar= Optional.ofNullable(ruleDao.getCodeSplitFlag()).orElse("");
+            spitChar=spitChar.equals("*")?"":spitChar;
             codeBuffer.append(ruleDao.getCodeHeader()).append(spitChar).append(getBody(ruleDao)).append(spitChar).append(StringUtils.leftPad(serial,serialLen,'0'));
             return codeBuffer.toString();
         }

lzbi-module/src/main/java/com/lzbi/code/service/DcBusiCoderuleConfigService.java

@@ -0,0 +1,91 @@
+package com.lzbi.code.service;
+
+import java.util.List;
+import com.lzbi.common.utils.DateUtils;
+import org.springframework.stereotype.Service;
+import com.lzbi.code.domain.DcBusiCoderuleConfig;
+import com.lzbi.code.mapper.DcBusiCoderuleConfigMapper;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+/**
+ * 业务编码配置Service业务层处理
+ * 
+ * @author zhousq
+ * @date 2023-12-06
+ */
+@Service
+public class DcBusiCoderuleConfigService extends ServiceImpl<DcBusiCoderuleConfigMapper, DcBusiCoderuleConfig> implements IService<DcBusiCoderuleConfig>
+{
+
+    /**
+     * 查询业务编码配置
+     * 
+     * @param id 业务编码配置主键
+     * @return 业务编码配置
+     */
+    public DcBusiCoderuleConfig selectDcBusiCoderuleConfigById(Long id)
+    {
+        return baseMapper.selectDcBusiCoderuleConfigById(id);
+    }
+
+    /**
+     * 查询业务编码配置列表
+     * 
+     * @param dcBusiCoderuleConfig 业务编码配置
+     * @return 业务编码配置
+     */
+    public List<DcBusiCoderuleConfig> selectDcBusiCoderuleConfigList(DcBusiCoderuleConfig dcBusiCoderuleConfig)
+    {
+        return baseMapper.selectDcBusiCoderuleConfigList(dcBusiCoderuleConfig);
+    }
+
+    /**
+     * 新增业务编码配置
+     * 
+     * @param dcBusiCoderuleConfig 业务编码配置
+     * @return 结果
+     */
+
+    public int insertDcBusiCoderuleConfig(DcBusiCoderuleConfig dcBusiCoderuleConfig)
+    {
+        dcBusiCoderuleConfig.setCreatedTime(DateUtils.getNowDate());
+        return baseMapper.insertDcBusiCoderuleConfig(dcBusiCoderuleConfig);
+    }
+
+    /**
+     * 修改业务编码配置
+     * 
+     * @param dcBusiCoderuleConfig 业务编码配置
+     * @return 结果
+     */
+
+    public int updateDcBusiCoderuleConfig(DcBusiCoderuleConfig dcBusiCoderuleConfig)
+    {
+        dcBusiCoderuleConfig.setUpdatedTime(DateUtils.getNowDate());
+        return baseMapper.updateDcBusiCoderuleConfig(dcBusiCoderuleConfig);
+    }
+
+    /**
+     * 批量删除业务编码配置
+     * 
+     * @param ids 需要删除的业务编码配置主键
+     * @return 结果
+     */
+
+    public int deleteDcBusiCoderuleConfigByIds(Long[] ids)
+    {
+        return baseMapper.deleteDcBusiCoderuleConfigByIds(ids);
+    }
+
+    /**
+     * 删除业务编码配置信息
+     * 
+     * @param id 业务编码配置主键
+     * @return 结果
+     */
+
+    public int deleteDcBusiCoderuleConfigById(Long id)
+    {
+        return baseMapper.deleteDcBusiCoderuleConfigById(id);
+    }
+}

lzbi-module/src/main/java/com/lzbi/draft/controller/DcBusiParamDraftDayController.java

@@ -0,0 +1,131 @@
+package com.lzbi.draft.controller;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+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.lzbi.common.annotation.Log;
+import com.lzbi.common.core.controller.BaseController;
+import com.lzbi.common.core.domain.AjaxResult;
+import com.lzbi.common.enums.BusinessType;
+import com.lzbi.draft.domain. DcBusiParamDraftDay;
+import com.lzbi.draft.service.DcBusiParamDraftDayService;
+import com.lzbi.common.utils.poi.ExcelUtil;
+import com.lzbi.common.core.page.TableDataInfo;
+
+/**
+ * 参数数据底稿（日）Controller
+ * 
+ * @author zhousq
+ * @date 2023-12-06
+ */
+@RestController
+@RequestMapping("/asset/paramDayDraft")
+public class DcBusiParamDraftDayController extends BaseController
+{
+    @Autowired
+    private DcBusiParamDraftDayService dcBusiParamDraftDayService;
+
+    /**
+     * 查询参数数据底稿（日）列表
+     */
+    @ApiOperation("查询参数数据底稿（日）列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "DcBusiParamDraftDay", value = "", dataType = "DcBusiParamDraftDay", dataTypeClass = DcBusiParamDraftDay.class),
+    })
+    @PreAuthorize("@ss.hasPermi('asset:paramDayDraft:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(DcBusiParamDraftDay DcBusiParamDraftDay)
+    {
+        startPage();
+        List< DcBusiParamDraftDay> list = dcBusiParamDraftDayService.selectDcBusiParamDraftDayList(DcBusiParamDraftDay);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出参数数据底稿（日）列表
+     */
+    @ApiOperation("导出参数数据底稿（日）列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "DcBusiParamDraftDay", value = "", dataType = "DcBusiParamDraftDay", dataTypeClass = DcBusiParamDraftDay.class),
+    })
+    @PreAuthorize("@ss.hasPermi('asset:paramDayDraft:export')")
+    @Log(title = "参数数据底稿（日）", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response,DcBusiParamDraftDay DcBusiParamDraftDay)
+    {
+        List<DcBusiParamDraftDay> list = dcBusiParamDraftDayService.selectDcBusiParamDraftDayList(DcBusiParamDraftDay);
+        ExcelUtil<DcBusiParamDraftDay> util = new ExcelUtil<DcBusiParamDraftDay>(DcBusiParamDraftDay.class);
+        util.exportExcel(response, list, "参数数据底稿（日）数据");
+    }
+
+    /**
+     * 获取参数数据底稿（日）详细信息
+     */
+    @ApiOperation("获取参数数据底稿（日）详细信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "", dataType = "String", dataTypeClass = String.class),
+    })
+    @PreAuthorize("@ss.hasPermi('asset:paramDayDraft:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id)
+    {
+        return success(dcBusiParamDraftDayService.selectDcBusiParamDraftDayById(id));
+    }
+
+    /**
+     * 新增参数数据底稿（日）
+     */
+    @ApiOperation("新增参数数据底稿（日）")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "DcBusiParamDraftDay", value = "", dataType = "DcBusiParamDraftDay", dataTypeClass = DcBusiParamDraftDay.class),
+    })
+    @PreAuthorize("@ss.hasPermi('asset:paramDayDraft:add')")
+    @Log(title = "参数数据底稿（日）", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody DcBusiParamDraftDay DcBusiParamDraftDay)
+    {
+        return toAjax(dcBusiParamDraftDayService.insertDcBusiParamDraftDay(DcBusiParamDraftDay));
+    }
+
+    /**
+     * 修改参数数据底稿（日）
+     */
+
+    @ApiOperation("修改参数数据底稿（日）")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "DcBusiParamDraftDay", value = "", dataType = "DcBusiParamDraftDay", dataTypeClass = DcBusiParamDraftDay.class),
+    })
+    @PreAuthorize("@ss.hasPermi('asset:paramDayDraft:edit')")
+    @Log(title = "参数数据底稿（日）", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody DcBusiParamDraftDay DcBusiParamDraftDay)
+    {
+        return toAjax(dcBusiParamDraftDayService.updateDcBusiParamDraftDay(DcBusiParamDraftDay));
+    }
+
+    /**
+     * 删除参数数据底稿（日）
+     */
+    @ApiOperation("删除参数数据底稿（日）")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "ids", value = "", dataType = "String", dataTypeClass =String.class),
+    })
+    @PreAuthorize("@ss.hasPermi('asset:paramDayDraft:remove')")
+    @Log(title = "参数数据底稿（日）", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(dcBusiParamDraftDayService.deleteDcBusiParamDraftDayByIds(ids));
+    }
+}

lzbi-module/src/main/java/com/lzbi/draft/controller/DcBusiTargetDraftMonthController.java

@@ -0,0 +1,133 @@
+package com.lzbi.draft.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+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.lzbi.common.annotation.Log;
+import com.lzbi.common.core.controller.BaseController;
+import com.lzbi.common.core.domain.AjaxResult;
+import com.lzbi.common.enums.BusinessType;
+import com.lzbi.draft.domain. DcBusiTargetDraftMonth;
+import com.lzbi.draft.service.DcBusiTargetDraftMonthService;
+import com.lzbi.common.utils.poi.ExcelUtil;
+import com.lzbi.common.core.page.TableDataInfo;
+
+/**
+ * 指标数据底稿(月)Controller
+ * 
+ * @author zhousq
+ * @date 2023-12-06
+ */
+@RestController
+@RequestMapping("/draft/targetMonthDraft")
+public class DcBusiTargetDraftMonthController extends BaseController
+{
+    @Autowired
+    private DcBusiTargetDraftMonthService dcBusiTargetDraftMonthService;
+
+    /**
+     * 查询指标数据底稿(月)列表
+     */
+    @ApiOperation("查询指标数据底稿(月)列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "DcBusiTargetDraftMonth", value = "", dataType = "DcBusiTargetDraftMonth", dataTypeClass = DcBusiTargetDraftMonth.class),
+    })
+    @PreAuthorize("@ss.hasPermi('draft:targetMonthDraft:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(DcBusiTargetDraftMonth DcBusiTargetDraftMonth)
+    {
+        startPage();
+        List< DcBusiTargetDraftMonth> list = dcBusiTargetDraftMonthService.selectDcBusiTargetDraftMonthList(DcBusiTargetDraftMonth);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出指标数据底稿(月)列表
+     */
+    @ApiOperation("导出指标数据底稿(月)列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "DcBusiTargetDraftMonth", value = "", dataType = "DcBusiTargetDraftMonth", dataTypeClass = DcBusiTargetDraftMonth.class),
+    })
+    @PreAuthorize("@ss.hasPermi('draft:targetMonthDraft:export')")
+    @Log(title = "指标数据底稿(月)", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, DcBusiTargetDraftMonth DcBusiTargetDraftMonth)
+    {
+        List< DcBusiTargetDraftMonth> list = dcBusiTargetDraftMonthService.selectDcBusiTargetDraftMonthList(DcBusiTargetDraftMonth);
+        ExcelUtil< DcBusiTargetDraftMonth> util = new ExcelUtil<DcBusiTargetDraftMonth>(DcBusiTargetDraftMonth.class);
+        util.exportExcel(response, list, "指标数据底稿(月)数据");
+    }
+
+    /**
+     * 获取指标数据底稿(月)详细信息
+     */
+    @ApiOperation("获取指标数据底稿(月)详细信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "", dataType = "Long", dataTypeClass = Long.class),
+    })
+    @PreAuthorize("@ss.hasPermi('draft:targetMonthDraft:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(dcBusiTargetDraftMonthService.selectDcBusiTargetDraftMonthById(id));
+    }
+
+    /**
+     * 新增指标数据底稿(月)
+     */
+    @ApiOperation("新增指标数据底稿(月)")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "DcBusiTargetDraftMonth", value = "", dataType = "DcBusiTargetDraftMonth", dataTypeClass = DcBusiTargetDraftMonth.class),
+    })
+    @PreAuthorize("@ss.hasPermi('draft:targetMonthDraft:add')")
+    @Log(title = "指标数据底稿(月)", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody DcBusiTargetDraftMonth DcBusiTargetDraftMonth)
+    {
+        return toAjax(dcBusiTargetDraftMonthService.insertDcBusiTargetDraftMonth(DcBusiTargetDraftMonth));
+    }
+
+    /**
+     * 修改指标数据底稿(月)
+     */
+
+    @ApiOperation("修改指标数据底稿(月)")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "DcBusiTargetDraftMonth", value = "", dataType = "DcBusiTargetDraftMonth", dataTypeClass = DcBusiTargetDraftMonth.class),
+    })
+    @PreAuthorize("@ss.hasPermi('draft:targetMonthDraft:edit')")
+    @Log(title = "指标数据底稿(月)", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody DcBusiTargetDraftMonth DcBusiTargetDraftMonth)
+    {
+        return toAjax(dcBusiTargetDraftMonthService.updateDcBusiTargetDraftMonth(DcBusiTargetDraftMonth));
+    }
+
+    /**
+     * 删除指标数据底稿(月)
+     */
+    @ApiOperation("删除指标数据底稿(月)")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "ids", value = "", dataType = "Long", dataTypeClass =Long.class),
+    })
+    @PreAuthorize("@ss.hasPermi('draft:targetMonthDraft:remove')")
+    @Log(title = "指标数据底稿(月)", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(dcBusiTargetDraftMonthService.deleteDcBusiTargetDraftMonthByIds(ids));
+    }
+}

lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiParamDraftDay.java

@@ -1,157 +1,203 @@
 package com.lzbi.draft.domain;
 
-import com.baomidou.mybatisplus.annotation.IdType;
+
-import io.swagger.annotations.ApiModel;
+import java.util.Date;
-import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.NoArgsConstructor;
+import com.lzbi.common.annotation.Excel;
-import lombok.experimental.Accessors;
 import com.lzbi.module.base.BaseModuleEntity;
 
 /**
- * 参数数据底稿表（日）;
+ * 参数数据底稿（日）对象 dc_busi_param_draft_day
- * @author : zhousq
+ * 
- * @date : 2023-12-1
+ * @author zhousq
+ * @date 2023-12-06
  */
 @Data
-@NoArgsConstructor
+public class DcBusiParamDraftDay extends BaseModuleEntity
-@AllArgsConstructor
+{
-@Accessors(chain = true)
+    private static final long serialVersionUID = 1L;
-@ApiModel(value = "参数数据底稿表（日）",description = "")
+
-@TableName("dc_busi_param_draft_day")
+    /** 创建人 */
-public class DcBusiParamDraftDay extends BaseModuleEntity{
+    private String createdBy;
+
+    /** 创建时间 */
+    private Date createdTime;
+
+    /** 更新人 */
+    private String updatedBy;
+
+    /** 更新时间 */
+    private Date updatedTime;
+
     /** 主键 */
-    @ApiModelProperty(name = "主键",notes = "")
+    @Excel(name = "主键")
-    @TableId(type = IdType.AUTO)
+    private String id;
-    private Integer id ;
+
     /** 公司编码 */
-    @ApiModelProperty(name = "公司编码",notes = "")
+    private Integer companyId;
-    private String companyCode ;
+
     /** 生产组织机构名称 */
-    @ApiModelProperty(name = "生产组织机构名称",notes = "")
+    @Excel(name = "生产组织机构名称")
-    private String organizeName ;
+    private String organizeName;
+
     /** 生产组织机构编号 */
-    @ApiModelProperty(name = "生产组织机构编号",notes = "")
+    private Integer organizeId;
-    private String organizeCode ;
+
     /** 公司名称 */
-    @ApiModelProperty(name = "公司名称",notes = "")
+    @Excel(name = "公司名称")
-    private String companyName ;
+    private String companyName;
-    /** 统计单元 */
+
-    @ApiModelProperty(name = "统计单元",notes = "")
+    /** 统计单元编码 */
-    private String assetCode ;
+    @Excel(name = "统计单元编码")
-    @ApiModelProperty(name = "统计单元",notes = "")
+    private String assetCode;
-    private String assetName ;
 
     /** 参数编码 */
-    @ApiModelProperty(name = "参数编码",notes = "")
+    @Excel(name = "参数编码")
-    private String paramCode ;
+    private String paramCode;
+
     /** 参数名称 */
-    @ApiModelProperty(name = "参数名称",notes = "")
+    @Excel(name = "参数名称")
-    private String paramName ;
+    private String paramName;
-    /** 生产专业 */
+
-    @ApiModelProperty(name = "生产专业",notes = "")
+    /** 生产专业编码 */
-    private String paramField ;
+    @Excel(name = "生产专业编码")
+    private String paramFieldCode;
+    @Excel(name = "生产专业名称")
+    private String paramFieldName;
     /** 指标单位 */
-    @ApiModelProperty(name = "指标单位",notes = "")
+    @Excel(name = "指标单位")
-    private String targetUint ;
+    private String targetUint;
-    /** 统计日期[yyyy-mm-dd] */
+
-    @ApiModelProperty(name = "统计日期[yyyy-mm-dd]",notes = "")
+    /** 统计日期[ */
-    private String countDate ;
+    @Excel(name = "统计日期[")
+    private String countDate;
+
     /** 均值 */
-    @ApiModelProperty(name = "均值",notes = "")
+    @Excel(name = "均值")
-    private Double valAvg ;
+    private double valAvg;
+
     /** 当日最大值 */
-    @ApiModelProperty(name = "当日最大值",notes = "")
+    @Excel(name = "当日最大值")
-    private Double valMax ;
+    private double valMax;
+
     /** 和值 */
-    @ApiModelProperty(name = "和值",notes = "")
+    @Excel(name = "和值")
-    private String valSum ;
+    private String valSum;
+
     /** 当日最小值 */
-    @ApiModelProperty(name = "当日最小值",notes = "")
+    @Excel(name = "当日最小值")
-    private Double valMin ;
+    private double valMin;
+
     /** 积算值 */
-    @ApiModelProperty(name = "积算值",notes = "")
+    @Excel(name = "积算值")
-    private Double valIntegrating ;
+    private double valIntegrating;
+
     /** 上限 */
-    @ApiModelProperty(name = "上限",notes = "")
+    @Excel(name = "上限")
-    private Double valLimitUp ;
+    private double valLimitUp;
+
     /** 下限 */
-    @ApiModelProperty(name = "下限",notes = "")
+    @Excel(name = "下限")
-    private Double valLimitDown ;
+    private double valLimitDown;
-    /** 1时;[00:00:00，00：59:59] */
+
-    @ApiModelProperty(name = "1时",notes = "[00:00:00，00：59:59]")
+    /** 1时 */
-    private Double val01 ;
+    @Excel(name = "1时")
+    private double val01;
+
     /** 2时;[01:00:00，01：59:59] */
-    @ApiModelProperty(name = "2时",notes = "[01:00:00，01：59:59]")
+    @Excel(name = "2时;[01:00:00，01：59:59]")
-    private Double val02 ;
+    private double val02;
+
     /** 3时;[02:00:00，02：59:59] */
-    @ApiModelProperty(name = "3时",notes = "[02:00:00，02：59:59]")
+    @Excel(name = "3时;[02:00:00，02：59:59]")
-    private Double val03 ;
+    private double val03;
+
     /** 4时 */
-    @ApiModelProperty(name = "4时",notes = "")
+    @Excel(name = "4时")
-    private Double val04 ;
+    private double val04;
+
     /** 5时 */
-    @ApiModelProperty(name = "5时",notes = "")
+    @Excel(name = "5时")
-    private Double val05 ;
+    private double val05;
+
     /** 6时 */
-    @ApiModelProperty(name = "6时",notes = "")
+    @Excel(name = "6时")
-    private Double val06 ;
+    private double val06;
+
     /** 7时 */
-    @ApiModelProperty(name = "7时",notes = "")
+    @Excel(name = "7时")
-    private Double val07 ;
+    private double val07;
+
     /** 8时 */
-    @ApiModelProperty(name = "8时",notes = "")
+    @Excel(name = "8时")
-    private Double val08 ;
+    private double val08;
+
     /** 9时 */
-    @ApiModelProperty(name = "9时",notes = "")
+    @Excel(name = "9时")
-    private Double val09 ;
+    private double val09;
+
     /** 10时 */
-    @ApiModelProperty(name = "10时",notes = "")
+    @Excel(name = "10时")
-    private Double val10 ;
+    private double val10;
+
     /** 11时 */
-    @ApiModelProperty(name = "11时",notes = "")
+    @Excel(name = "11时")
-    private Double val11 ;
+    private double val11;
+
     /** 12时 */
-    @ApiModelProperty(name = "12时",notes = "")
+    @Excel(name = "12时")
-    private Double val12 ;
+    private double val12;
+
     /** 13时 */
-    @ApiModelProperty(name = "13时",notes = "")
+    @Excel(name = "13时")
-    private Double val13 ;
+    private double val13;
+
     /** 14时 */
-    @ApiModelProperty(name = "14时",notes = "")
+    @Excel(name = "14时")
-    private Double val14 ;
+    private double val14;
+
     /** 15时 */
-    @ApiModelProperty(name = "15时",notes = "")
+    @Excel(name = "15时")
-    private Double val15 ;
+    private double val15;
+
     /** 16时 */
-    @ApiModelProperty(name = "16时",notes = "")
+    @Excel(name = "16时")
-    private Double val16 ;
+    private double val16;
+
     /** 17时 */
-    @ApiModelProperty(name = "17时",notes = "")
+    @Excel(name = "17时")
-    private Double val17 ;
+    private double val17;
+
     /** 18时 */
-    @ApiModelProperty(name = "18时",notes = "")
+    @Excel(name = "18时")
-    private Double val18 ;
+    private double val18;
+
     /** 18时 */
-    @ApiModelProperty(name = "18时",notes = "")
+    @Excel(name = "18时")
-    private Double val19 ;
+    private double val19;
+
     /** 20时 */
-    @ApiModelProperty(name = "20时",notes = "")
+    @Excel(name = "20时")
-    private Double val20 ;
+    private double val20;
+
     /** 21时 */
-    @ApiModelProperty(name = "21时",notes = "")
+    @Excel(name = "21时")
-    private Double val21 ;
+    private double val21;
+
     /** 22时 */
-    @ApiModelProperty(name = "22时",notes = "")
+    @Excel(name = "22时")
-    private Double val22 ;
+    private double val22;
+
     /** 23时 */
-    @ApiModelProperty(name = "23时",notes = "")
+    @Excel(name = "23时")
-    private Double val23 ;
+    private double val23;
+
     /** 24时 */
-    @ApiModelProperty(name = "24时",notes = "")
+    @Excel(name = "24时")
-    private Double val24 ;
+    private double val24;
+
+    /** 统计单元名称 */
+    @Excel(name = "统计单元名称")
+    private String assetName;
 
-}
+}

lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiTargetDraftMonth.java

@@ -0,0 +1,230 @@
+package com.lzbi.draft.domain;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import lombok.Data;
+import com.lzbi.common.annotation.Excel;
+import com.lzbi.module.base.BaseModuleEntity;
+
+/**
+ * 指标数据底稿(月)对象 dc_busi_target_draft_month
+ * 
+ * @author zhousq
+ * @date 2023-12-06
+ */
+@Data
+public class DcBusiTargetDraftMonth extends BaseModuleEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long id;
+
+    /** 公司名称 */
+    @Excel(name = "公司名称")
+    private String companyName;
+
+    /** 公司ID */
+    private Long companyId;
+
+    /** 组织机构ID */
+    private Long orgId;
+
+    /** 组织机构名称 */
+    @Excel(name = "组织机构名称")
+    private String orgName;
+
+    /** 统计单元编码 */
+    @Excel(name = "统计单元编码")
+    private String assetCode;
+
+    /** 统计单元名称 */
+    @Excel(name = "统计单元名称")
+    private String assetName;
+
+    /** 所属专业编码 */
+    @Excel(name = "所属专业编码")
+    private String fieldCode;
+
+    /** 所属专业名称 */
+    @Excel(name = "所属专业名称")
+    private String fieldName;
+
+    /** 指标别名 */
+    @Excel(name = "指标别名")
+    private String targetNameAlias;
+
+    /** 指标名称 */
+    @Excel(name = "指标名称")
+    private String targetName;
+
+    /** 指标编码 */
+    @Excel(name = "指标编码")
+    private String targetCode;
+
+    /** 指标单位 */
+    @Excel(name = "指标单位")
+    private String targetUint;
+
+    /** 年 */
+    @Excel(name = "年")
+    private String countYear;
+
+    /** 月 */
+    @Excel(name = "月")
+    private String countMonth;
+
+    /** 和值 */
+    @Excel(name = "和值")
+    private BigDecimal valSum;
+
+    /** 均值 */
+    @Excel(name = "均值")
+    private BigDecimal valAvgAll;
+
+    /** 非空均值 */
+    @Excel(name = "非空均值")
+    private BigDecimal valAvgNull;
+
+    /** 计划值 */
+    @Excel(name = "计划值")
+    private BigDecimal valPlan;
+
+    /** 创建人 */
+    private String createdBy;
+
+    /** 创建时间 */
+    private Date createdTime;
+
+    /** 更新人 */
+    private String updatedBy;
+
+    /** 更新时间 */
+    private Date updatedTime;
+
+    /** 1日 */
+    @Excel(name = "1日")
+    private BigDecimal valP1;
+
+    /** 2日 */
+    @Excel(name = "2日")
+    private BigDecimal valP2;
+
+    /** 3日 */
+    @Excel(name = "3日")
+    private BigDecimal valP3;
+
+    /** 4日 */
+    @Excel(name = "4日")
+    private BigDecimal valP4;
+
+    /** 5日 */
+    @Excel(name = "5日")
+    private BigDecimal valP5;
+
+    /** 6日 */
+    @Excel(name = "6日")
+    private BigDecimal valP6;
+
+    /** 7日 */
+    @Excel(name = "7日")
+    private BigDecimal valP7;
+
+    /** 8日 */
+    @Excel(name = "8日")
+    private BigDecimal valP8;
+
+    /** 9日 */
+    @Excel(name = "9日")
+    private BigDecimal valP9;
+
+    /** 10日 */
+    @Excel(name = "10日")
+    private BigDecimal valP10;
+
+    /** 11日 */
+    @Excel(name = "11日")
+    private BigDecimal valP11;
+
+    /** 12日 */
+    @Excel(name = "12日")
+    private BigDecimal valP12;
+
+    /** 13日 */
+    @Excel(name = "13日")
+    private BigDecimal valP13;
+
+    /** 14日 */
+    @Excel(name = "14日")
+    private BigDecimal valP14;
+
+    /** 15日 */
+    @Excel(name = "15日")
+    private BigDecimal valP15;
+
+    /** 16日 */
+    @Excel(name = "16日")
+    private BigDecimal valP16;
+
+    /** 17日 */
+    @Excel(name = "17日")
+    private BigDecimal valP17;
+
+    /** 18日 */
+    @Excel(name = "18日")
+    private BigDecimal valP18;
+
+    /** 19日 */
+    @Excel(name = "19日")
+    private BigDecimal valP19;
+
+    /** 20日 */
+    @Excel(name = "20日")
+    private BigDecimal valP20;
+
+    /** 21日 */
+    @Excel(name = "21日")
+    private BigDecimal valP21;
+
+    /** 22日 */
+    @Excel(name = "22日")
+    private BigDecimal valP22;
+
+    /** 23日 */
+    @Excel(name = "23日")
+    private BigDecimal valP23;
+
+    /** 24日 */
+    @Excel(name = "24日")
+    private BigDecimal valP24;
+
+    /** 25日 */
+    @Excel(name = "25日")
+    private BigDecimal valP25;
+
+    /** 26日 */
+    @Excel(name = "26日")
+    private BigDecimal valP26;
+
+    /** 27日 */
+    @Excel(name = "27日")
+    private BigDecimal valP27;
+
+    /** 28日 */
+    @Excel(name = "28日")
+    private BigDecimal valP28;
+
+    /** 29日 */
+    @Excel(name = "29日")
+    private BigDecimal valP29;
+
+    /** 30日 */
+    @Excel(name = "30日")
+    private BigDecimal valP30;
+
+    /** 31日 */
+    @Excel(name = "31日")
+    private BigDecimal valP31;
+
+}

lzbi-module/src/main/java/com/lzbi/draft/mapper/DcBusiParamDraftDayMapper.java

@@ -1,21 +1,65 @@
 package com.lzbi.draft.mapper;
 
-import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
+import java.util.List;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.lzbi.draft.domain.DcBusiParamDraftDay;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.lzbi.draft.domain.ParamDraftQueryVo;
 
-import java.util.List;
-
 /**
- * 参数数据底稿表（日）;(dc_busi_param_draft_day)表数据库访问层
+ * 参数数据底稿（日）Mapper接口
- * @author : zhousq
+ * 
- * @date : 2023-12-1
+ * @author zhousq
+ * @date 2023-12-06
  */
-@InterceptorIgnore(tenantLine = "true")
-public interface DcBusiParamDraftDayMapper  extends BaseMapper<DcBusiParamDraftDay>{
-    List<DcBusiParamDraftDay>  selectByVo( DcBusiParamDraftDay beanVo);
-    int  insertByVo( DcBusiParamDraftDay beanVo);
-    DcBusiParamDraftDay  selectOneByParam( ParamDraftQueryVo beanVo);
 
-}
+public interface DcBusiParamDraftDayMapper extends BaseMapper<DcBusiParamDraftDay>
+{
+    /**
+     * 查询参数数据底稿（日）
+     * 
+     * @param id 参数数据底稿（日）主键
+     * @return 参数数据底稿（日）
+     */
+    public DcBusiParamDraftDay selectDcBusiParamDraftDayById(String id);
+    public DcBusiParamDraftDay selectOneByParam(ParamDraftQueryVo queryVo);
+
+    /**
+     * 查询参数数据底稿（日）列表
+     * 
+     * @param dcBusiParamDraftDay 参数数据底稿（日）
+     * @return 参数数据底稿（日）集合
+     */
+    public List<DcBusiParamDraftDay> selectDcBusiParamDraftDayList(DcBusiParamDraftDay dcBusiParamDraftDay);
+
+    /**
+     * 新增参数数据底稿（日）
+     * 
+     * @param dcBusiParamDraftDay 参数数据底稿（日）
+     * @return 结果
+     */
+    public int insertDcBusiParamDraftDay(DcBusiParamDraftDay dcBusiParamDraftDay);
+
+    /**
+     * 修改参数数据底稿（日）
+     * 
+     * @param dcBusiParamDraftDay 参数数据底稿（日）
+     * @return 结果
+     */
+    public int updateDcBusiParamDraftDay(DcBusiParamDraftDay dcBusiParamDraftDay);
+
+    /**
+     * 删除参数数据底稿（日）
+     * 
+     * @param id 参数数据底稿（日）主键
+     * @return 结果
+     */
+    public int deleteDcBusiParamDraftDayById(String id);
+
+    /**
+     * 批量删除参数数据底稿（日）
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteDcBusiParamDraftDayByIds(String[] ids);
+}

lzbi-module/src/main/java/com/lzbi/draft/mapper/DcBusiTargetDraftMonthMapper.java

@@ -0,0 +1,63 @@
+package com.lzbi.draft.mapper;
+
+import java.util.List;
+import com.lzbi.draft.domain.DcBusiTargetDraftMonth;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 指标数据底稿(月)Mapper接口
+ * 
+ * @author zhousq
+ * @date 2023-12-06
+ */
+
+public interface DcBusiTargetDraftMonthMapper extends BaseMapper<DcBusiTargetDraftMonth>
+{
+    /**
+     * 查询指标数据底稿(月)
+     * 
+     * @param id 指标数据底稿(月)主键
+     * @return 指标数据底稿(月)
+     */
+    public DcBusiTargetDraftMonth selectDcBusiTargetDraftMonthById(Long id);
+
+    /**
+     * 查询指标数据底稿(月)列表
+     * 
+     * @param dcBusiTargetDraftMonth 指标数据底稿(月)
+     * @return 指标数据底稿(月)集合
+     */
+    public List<DcBusiTargetDraftMonth> selectDcBusiTargetDraftMonthList(DcBusiTargetDraftMonth dcBusiTargetDraftMonth);
+
+    /**
+     * 新增指标数据底稿(月)
+     * 
+     * @param dcBusiTargetDraftMonth 指标数据底稿(月)
+     * @return 结果
+     */
+    public int insertDcBusiTargetDraftMonth(DcBusiTargetDraftMonth dcBusiTargetDraftMonth);
+
+    /**
+     * 修改指标数据底稿(月)
+     * 
+     * @param dcBusiTargetDraftMonth 指标数据底稿(月)
+     * @return 结果
+     */
+    public int updateDcBusiTargetDraftMonth(DcBusiTargetDraftMonth dcBusiTargetDraftMonth);
+
+    /**
+     * 删除指标数据底稿(月)
+     * 
+     * @param id 指标数据底稿(月)主键
+     * @return 结果
+     */
+    public int deleteDcBusiTargetDraftMonthById(Long id);
+
+    /**
+     * 批量删除指标数据底稿(月)
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteDcBusiTargetDraftMonthByIds(Long[] ids);
+}

lzbi-module/src/main/java/com/lzbi/draft/service/DcBusiParamDraftDayService.java

@@ -1,29 +1,96 @@
 package com.lzbi.draft.service;
 
-import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.lzbi.common.utils.DateUtils;
 import com.lzbi.draft.domain.ParamDraftQueryVo;
-import com.lzbi.draft.mapper.DcBusiParamDraftDayMapper;
 import org.springframework.stereotype.Service;
 import com.lzbi.draft.domain.DcBusiParamDraftDay;
-import java.util.List;
+import com.lzbi.draft.mapper.DcBusiParamDraftDayMapper;
-
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
- * 参数数据底稿表（日）;(dc_busi_param_draft_day)表服务接口
+ * 参数数据底稿（日）Service业务层处理
- * @author : zhousq
+ * 
- * @date : 2023-12-1
+ * @author zhousq
+ * @date 2023-12-06
  */
 @Service
-public class DcBusiParamDraftDayService  extends ServiceImpl<DcBusiParamDraftDayMapper, DcBusiParamDraftDay> implements IService<DcBusiParamDraftDay> {
+public class DcBusiParamDraftDayService extends ServiceImpl<DcBusiParamDraftDayMapper, DcBusiParamDraftDay> implements IService<DcBusiParamDraftDay>
+{
 
-    public  List<DcBusiParamDraftDay> selectByVo( DcBusiParamDraftDay dcBusiParamDraftDay){
+    /**
-        return baseMapper.selectByVo(dcBusiParamDraftDay);
+     * 查询参数数据底稿（日）
+     * 
+     * @param id 参数数据底稿（日）主键
+     * @return 参数数据底稿（日）
+     */
+    public DcBusiParamDraftDay selectDcBusiParamDraftDayById(String id)
+    {
+        return baseMapper.selectDcBusiParamDraftDayById(id);
     }
-    public int  insertByVo( DcBusiParamDraftDay dcBusiParamDraftDay){
+    public DcBusiParamDraftDay selectOneByParam(ParamDraftQueryVo queryVo)
-        return baseMapper.insertByVo(dcBusiParamDraftDay);
+    {
-    }
-    public DcBusiParamDraftDay selectOneByParam(ParamDraftQueryVo queryVo){
         return baseMapper.selectOneByParam(queryVo);
     }
 
-}
+    /**
+     * 查询参数数据底稿（日）列表
+     * 
+     * @param dcBusiParamDraftDay 参数数据底稿（日）
+     * @return 参数数据底稿（日）
+     */
+    public List<DcBusiParamDraftDay> selectDcBusiParamDraftDayList(DcBusiParamDraftDay dcBusiParamDraftDay)
+    {
+        return baseMapper.selectDcBusiParamDraftDayList(dcBusiParamDraftDay);
+    }
+
+    /**
+     * 新增参数数据底稿（日）
+     * 
+     * @param dcBusiParamDraftDay 参数数据底稿（日）
+     * @return 结果
+     */
+
+    public int insertDcBusiParamDraftDay(DcBusiParamDraftDay dcBusiParamDraftDay)
+    {
+        dcBusiParamDraftDay.setCreatedTime(DateUtils.getNowDate());
+        return baseMapper.insertDcBusiParamDraftDay(dcBusiParamDraftDay);
+    }
+
+    /**
+     * 修改参数数据底稿（日）
+     * 
+     * @param dcBusiParamDraftDay 参数数据底稿（日）
+     * @return 结果
+     */
+
+    public int updateDcBusiParamDraftDay(DcBusiParamDraftDay dcBusiParamDraftDay)
+    {
+        dcBusiParamDraftDay.setUpdatedTime(DateUtils.getNowDate());
+        return baseMapper.updateDcBusiParamDraftDay(dcBusiParamDraftDay);
+    }
+
+    /**
+     * 批量删除参数数据底稿（日）
+     * 
+     * @param ids 需要删除的参数数据底稿（日）主键
+     * @return 结果
+     */
+
+    public int deleteDcBusiParamDraftDayByIds(String[] ids)
+    {
+        return baseMapper.deleteDcBusiParamDraftDayByIds(ids);
+    }
+
+    /**
+     * 删除参数数据底稿（日）信息
+     * 
+     * @param id 参数数据底稿（日）主键
+     * @return 结果
+     */
+
+    public int deleteDcBusiParamDraftDayById(String id)
+    {
+        return baseMapper.deleteDcBusiParamDraftDayById(id);
+    }
+}

lzbi-module/src/main/java/com/lzbi/draft/service/DcBusiTargetDraftMonthService.java

@@ -0,0 +1,91 @@
+package com.lzbi.draft.service;
+
+import java.util.List;
+import com.lzbi.common.utils.DateUtils;
+import org.springframework.stereotype.Service;
+import com.lzbi.draft.domain.DcBusiTargetDraftMonth;
+import com.lzbi.draft.mapper.DcBusiTargetDraftMonthMapper;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+/**
+ * 指标数据底稿(月)Service业务层处理
+ * 
+ * @author zhousq
+ * @date 2023-12-06
+ */
+@Service
+public class DcBusiTargetDraftMonthService extends ServiceImpl<DcBusiTargetDraftMonthMapper, DcBusiTargetDraftMonth> implements IService<DcBusiTargetDraftMonth>
+{
+
+    /**
+     * 查询指标数据底稿(月)
+     * 
+     * @param id 指标数据底稿(月)主键
+     * @return 指标数据底稿(月)
+     */
+    public DcBusiTargetDraftMonth selectDcBusiTargetDraftMonthById(Long id)
+    {
+        return baseMapper.selectDcBusiTargetDraftMonthById(id);
+    }
+
+    /**
+     * 查询指标数据底稿(月)列表
+     * 
+     * @param dcBusiTargetDraftMonth 指标数据底稿(月)
+     * @return 指标数据底稿(月)
+     */
+    public List<DcBusiTargetDraftMonth> selectDcBusiTargetDraftMonthList(DcBusiTargetDraftMonth dcBusiTargetDraftMonth)
+    {
+        return baseMapper.selectDcBusiTargetDraftMonthList(dcBusiTargetDraftMonth);
+    }
+
+    /**
+     * 新增指标数据底稿(月)
+     * 
+     * @param dcBusiTargetDraftMonth 指标数据底稿(月)
+     * @return 结果
+     */
+
+    public int insertDcBusiTargetDraftMonth(DcBusiTargetDraftMonth dcBusiTargetDraftMonth)
+    {
+        dcBusiTargetDraftMonth.setCreatedTime(DateUtils.getNowDate());
+        return baseMapper.insertDcBusiTargetDraftMonth(dcBusiTargetDraftMonth);
+    }
+
+    /**
+     * 修改指标数据底稿(月)
+     * 
+     * @param dcBusiTargetDraftMonth 指标数据底稿(月)
+     * @return 结果
+     */
+
+    public int updateDcBusiTargetDraftMonth(DcBusiTargetDraftMonth dcBusiTargetDraftMonth)
+    {
+        dcBusiTargetDraftMonth.setUpdatedTime(DateUtils.getNowDate());
+        return baseMapper.updateDcBusiTargetDraftMonth(dcBusiTargetDraftMonth);
+    }
+
+    /**
+     * 批量删除指标数据底稿(月)
+     * 
+     * @param ids 需要删除的指标数据底稿(月)主键
+     * @return 结果
+     */
+
+    public int deleteDcBusiTargetDraftMonthByIds(Long[] ids)
+    {
+        return baseMapper.deleteDcBusiTargetDraftMonthByIds(ids);
+    }
+
+    /**
+     * 删除指标数据底稿(月)信息
+     * 
+     * @param id 指标数据底稿(月)主键
+     * @return 结果
+     */
+
+    public int deleteDcBusiTargetDraftMonthById(Long id)
+    {
+        return baseMapper.deleteDcBusiTargetDraftMonthById(id);
+    }
+}

lzbi-module/src/main/java/com/lzbi/task/TaskParamDfratProcess.java

@@ -50,7 +50,7 @@ public class TaskParamDfratProcess {
                 if(StringUtils.isNull(dcBusiParamDraftDay.getId())){
                     dcBusiParamDraftDay.setCreatedTime(DateUtil.date());
                     dcBusiParamDraftDay.setCreatedBy("task");
-                    dcBusiParamDraftDay.setParamField(val.getFieldType());
+                    dcBusiParamDraftDay.setParamFieldCode(val.getFieldType());
                     dcBusiParamDraftDay.setParamCode(val.getParamCode());
                     dcBusiParamDraftDay.setCountDate(val.getCountDate());
                     dcBusiParamDraftDay.setAssetCode(val.getAssetCode());

lzbi-module/src/main/resources/mapper/asset/DcBusiCoderuleConfigMapper.xml

@@ -0,0 +1,101 @@
+<?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.lzbi.code.mapper.DcBusiCoderuleConfigMapper">
+    
+    <resultMap type="com.lzbi.code.domain.DcBusiCoderuleConfig" id="DcBusiCoderuleConfigResult">
+        <result property="tenantId"    column="tenant_id"    />
+        <result property="revision"    column="revision"    />
+        <result property="createdBy"    column="created_by"    />
+        <result property="createdTime"    column="created_time"    />
+        <result property="updatedBy"    column="updated_by"    />
+        <result property="updatedTime"    column="updated_time"    />
+        <result property="deleteBy"    column="delete_by"    />
+        <result property="deleteTime"    column="delete_time"    />
+        <result property="id"    column="id"    />
+        <result property="configName"    column="config_name"    />
+        <result property="nodeCode"    column="node_code"    />
+        <result property="columnName"    column="column_name"    />
+        <result property="ruleId"    column="rule_id"    />
+    </resultMap>
+
+    <sql id="selectDcBusiCoderuleConfigVo">
+        select tenant_id, revision, created_by, created_time, updated_by, updated_time, delete_by, delete_time, id, config_name, node_code, column_name, rule_id from dc_busi_coderule_config
+    </sql>
+
+    <select id="selectDcBusiCoderuleConfigList" parameterType="DcBusiCoderuleConfig" resultMap="DcBusiCoderuleConfigResult">
+        <include refid="selectDcBusiCoderuleConfigVo"/>
+        <where>  
+            <if test="configName != null  and configName != ''"> and config_name like concat('%', #{configName}, '%')</if>
+            <if test="nodeCode != null  and nodeCode != ''"> and node_code = #{nodeCode}</if>
+        </where>
+    </select>
+    
+    <select id="selectDcBusiCoderuleConfigById" parameterType="Long" resultMap="DcBusiCoderuleConfigResult">
+        <include refid="selectDcBusiCoderuleConfigVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertDcBusiCoderuleConfig" parameterType="DcBusiCoderuleConfig" useGeneratedKeys="true" keyProperty="id">
+        insert into dc_busi_coderule_config
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="tenantId != null">tenant_id,</if>
+            <if test="revision != null">revision,</if>
+            <if test="createdBy != null">created_by,</if>
+            <if test="createdTime != null">created_time,</if>
+            <if test="updatedBy != null">updated_by,</if>
+            <if test="updatedTime != null">updated_time,</if>
+            <if test="deleteBy != null">delete_by,</if>
+            <if test="deleteTime != null">delete_time,</if>
+            <if test="configName != null">config_name,</if>
+            <if test="nodeCode != null">node_code,</if>
+            <if test="columnName != null">column_name,</if>
+            <if test="ruleId != null">rule_id,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="tenantId != null">#{tenantId},</if>
+            <if test="revision != null">#{revision},</if>
+            <if test="createdBy != null">#{createdBy},</if>
+            <if test="createdTime != null">#{createdTime},</if>
+            <if test="updatedBy != null">#{updatedBy},</if>
+            <if test="updatedTime != null">#{updatedTime},</if>
+            <if test="deleteBy != null">#{deleteBy},</if>
+            <if test="deleteTime != null">#{deleteTime},</if>
+            <if test="configName != null">#{configName},</if>
+            <if test="nodeCode != null">#{nodeCode},</if>
+            <if test="columnName != null">#{columnName},</if>
+            <if test="ruleId != null">#{ruleId},</if>
+         </trim>
+    </insert>
+
+    <update id="updateDcBusiCoderuleConfig" parameterType="DcBusiCoderuleConfig">
+        update dc_busi_coderule_config
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="tenantId != null">tenant_id = #{tenantId},</if>
+            <if test="revision != null">revision = #{revision},</if>
+            <if test="createdBy != null">created_by = #{createdBy},</if>
+            <if test="createdTime != null">created_time = #{createdTime},</if>
+            <if test="updatedBy != null">updated_by = #{updatedBy},</if>
+            <if test="updatedTime != null">updated_time = #{updatedTime},</if>
+            <if test="deleteBy != null">delete_by = #{deleteBy},</if>
+            <if test="deleteTime != null">delete_time = #{deleteTime},</if>
+            <if test="configName != null">config_name = #{configName},</if>
+            <if test="nodeCode != null">node_code = #{nodeCode},</if>
+            <if test="columnName != null">column_name = #{columnName},</if>
+            <if test="ruleId != null">rule_id = #{ruleId},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteDcBusiCoderuleConfigById" parameterType="Long">
+        delete from dc_busi_coderule_config where id = #{id}
+    </delete>
+
+    <delete id="deleteDcBusiCoderuleConfigByIds" parameterType="String">
+        delete from dc_busi_coderule_config where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

lzbi-module/src/main/resources/mapper/asset/DcBusiParamDraftDayMapper.xml

@@ -1,254 +1,124 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
 <mapper namespace="com.lzbi.draft.mapper.DcBusiParamDraftDayMapper">
-    <resultMap type="com.lzbi.draft.domain.DcBusiParamDraftDay" id="rmDcBusiParamDraftDay">
+    
-        <!-- 租户号 -->
+    <resultMap type="com.lzbi.draft.domain.DcBusiParamDraftDay" id="DcBusiParamDraftDayResult">
-        <result property="tenantId" column="tenant_id"/>
+        <result property="tenantId"    column="tenant_id"    />
-        <!-- 乐观锁 -->
+        <result property="revision"    column="revision"    />
-        <result property="revision" column="revision"/>
+        <result property="createdBy"    column="created_by"    />
-        <!-- 创建人 -->
+        <result property="createdTime"    column="created_time"    />
-        <result property="createdBy" column="created_by"/>
+        <result property="updatedBy"    column="updated_by"    />
-        <!-- 创建时间 -->
+        <result property="updatedTime"    column="updated_time"    />
-        <result property="createdTime" column="created_time"/>
+        <result property="deleteBy"    column="delete_by"    />
-        <!-- 更新人 -->
+        <result property="deleteTime"    column="delete_time"    />
-        <result property="updatedBy" column="updated_by"/>
+        <result property="id"    column="id"    />
-        <!-- 更新时间 -->
+        <result property="companyId"    column="company_id"    />
-        <result property="updatedTime" column="updated_time"/>
+        <result property="organizeName"    column="organize_name"    />
-        <!-- 删除人 -->
+        <result property="organizeId"    column="organize_id"    />
-        <result property="deleteBy" column="delete_by"/>
+        <result property="companyName"    column="company_name"    />
-        <!-- 删除时间 -->
+        <result property="assetCode"    column="asset_code"    />
-        <result property="deleteTime" column="delete_time"/>
+        <result property="paramCode"    column="param_code"    />
-        <!-- 主键 -->
+        <result property="paramName"    column="param_name"    />
-        <result property="id" column="id"/>
+        <result property="paramFieldCode"    column="param_field_code"    />
-        <!-- 公司编码 -->
+        <result property="paramFieldName"    column="param_field_name"    />
-        <result property="companyCode" column="company_code"/>
+        <result property="targetUint"    column="target_uint"    />
-        <!-- 生产组织机构名称 -->
+        <result property="countDate"    column="count_date"    />
-        <result property="organizeName" column="organize_name"/>
+        <result property="valAvg"    column="val_avg"    />
-        <!-- 生产组织机构编号 -->
+        <result property="valMax"    column="val_max"    />
-        <result property="organizeCode" column="organize_code"/>
+        <result property="valSum"    column="val_sum"    />
-        <!-- 公司名称 -->
+        <result property="valMin"    column="val_min"    />
-        <result property="companyName" column="company_name"/>
+        <result property="valIntegrating"    column="val_integrating"    />
-        <!-- 统计单元 -->
+        <result property="valLimitUp"    column="val_limit_up"    />
-        <result property="assetCode" column="asset_code"/>
+        <result property="valLimitDown"    column="val_limit_down"    />
-        <!-- 统计单元 -->
+        <result property="val01"    column="val01"    />
-        <result property="assetName" column="asset_name"/>
+        <result property="val02"    column="val02"    />
-        <!-- 参数编码 -->
+        <result property="val03"    column="val03"    />
-        <result property="paramCode" column="param_code"/>
+        <result property="val04"    column="val04"    />
-        <!-- 参数名称 -->
+        <result property="val05"    column="val05"    />
-        <result property="paramName" column="param_name"/>
+        <result property="val06"    column="val06"    />
-        <!-- 生产专业 -->
+        <result property="val07"    column="val07"    />
-        <result property="paramField" column="param_field"/>
+        <result property="val08"    column="val08"    />
-        <!-- 指标单位 -->
+        <result property="val09"    column="val09"    />
-        <result property="targetUint" column="target_uint"/>
+        <result property="val10"    column="val10"    />
-        <!-- 统计日期[yyyy-mm-dd] -->
+        <result property="val11"    column="val11"    />
-        <result property="countDate" column="count_date"/>
+        <result property="val12"    column="val12"    />
-        <!-- 均值 -->
+        <result property="val13"    column="val13"    />
-        <result property="valAvg" column="val_avg"/>
+        <result property="val14"    column="val14"    />
-        <!-- 当日最大值 -->
+        <result property="val15"    column="val15"    />
-        <result property="valMax" column="val_max"/>
+        <result property="val16"    column="val16"    />
-        <!-- 和值 -->
+        <result property="val17"    column="val17"    />
-        <result property="valSum" column="val_sum"/>
+        <result property="val18"    column="val18"    />
-        <!-- 当日最小值 -->
+        <result property="val19"    column="val19"    />
-        <result property="valMin" column="val_min"/>
+        <result property="val20"    column="val20"    />
-        <!-- 积算值 -->
+        <result property="val21"    column="val21"    />
-        <result property="valIntegrating" column="val_integrating"/>
+        <result property="val22"    column="val22"    />
-        <!-- 上限 -->
+        <result property="val23"    column="val23"    />
-        <result property="valLimitUp" column="val_limit_up"/>
+        <result property="val24"    column="val24"    />
-        <!-- 下限 -->
+        <result property="assetName"    column="asset_name"    />
-        <result property="valLimitDown" column="val_limit_down"/>
-        <!-- 1时 -->
-        <result property="val01" column="val01"/>
-        <!-- 2时 -->
-        <result property="val02" column="val02"/>
-        <!-- 3时 -->
-        <result property="val03" column="val03"/>
-        <!-- 4时 -->
-        <result property="val04" column="val04"/>
-        <!-- 5时 -->
-        <result property="val05" column="val05"/>
-        <!-- 6时 -->
-        <result property="val06" column="val06"/>
-        <!-- 7时 -->
-        <result property="val07" column="val07"/>
-        <!-- 8时 -->
-        <result property="val08" column="val08"/>
-        <!-- 9时 -->
-        <result property="val09" column="val09"/>
-        <!-- 10时 -->
-        <result property="val10" column="val10"/>
-        <!-- 11时 -->
-        <result property="val11" column="val11"/>
-        <!-- 12时 -->
-        <result property="val12" column="val12"/>
-        <!-- 13时 -->
-        <result property="val13" column="val13"/>
-        <!-- 14时 -->
-        <result property="val14" column="val14"/>
-        <!-- 15时 -->
-        <result property="val15" column="val15"/>
-        <!-- 16时 -->
-        <result property="val16" column="val16"/>
-        <!-- 17时 -->
-        <result property="val17" column="val17"/>
-        <!-- 18时 -->
-        <result property="val18" column="val18"/>
-        <!-- 18时 -->
-        <result property="val19" column="val19"/>
-        <!-- 20时 -->
-        <result property="val20" column="val20"/>
-        <!-- 21时 -->
-        <result property="val21" column="val21"/>
-        <!-- 22时 -->
-        <result property="val22" column="val22"/>
-        <!-- 23时 -->
-        <result property="val23" column="val23"/>
-        <!-- 24时 -->
-        <result property="val24" column="val24"/>
     </resultMap>
-    <sql id="baseQuerySql">
+
-        select
+    <sql id="selectDcBusiParamDraftDayVo">
-            tenant_id,
+        select tenant_id, revision, created_by, created_time, updated_by, updated_time, delete_by, delete_time, id, company_id, organize_name, organize_id, company_name, asset_code, param_code, param_name, param_field_code,param_field_name, target_uint, count_date, val_avg, val_max, val_sum, val_min, val_integrating, val_limit_up, val_limit_down, val01, val02, val03, val04, val05, val06, val07, val08, val09, val10, val11, val12, val13, val14, val15, val16, val17, val18, val19, val20, val21, val22, val23, val24, asset_name from dc_busi_param_draft_day
-            revision,
-            created_by,
-            created_time,
-            updated_by,
-            updated_time,
-            delete_by,
-            delete_time,
-            id,
-            company_code,
-            organize_name,
-            organize_code,
-            company_name,
-            asset_code,
-            asset_name,
-            param_code,
-            param_name,
-            param_field,
-            target_uint,
-            count_date,
-            val_avg,
-            val_max,
-            val_sum,
-            val_min,
-            val_integrating,
-            val_limit_up,
-            val_limit_down,
-            val01,
-            val02,
-            val03,
-            val04,
-            val05,
-            val06,
-            val07,
-            val08,
-            val09,
-            val10,
-            val11,
-            val12,
-            val13,
-            val14,
-            val15,
-            val16,
-            val17,
-            val18,
-            val19,
-            val20,
-            val21,
-            val22,
-            val23,
-            val24
-        from  dc_busi_param_draft_day
     </sql>
-    <select id="selectByVo" resultMap="rmDcBusiParamDraftDay" parameterType="com.lzbi.draft.domain.DcBusiParamDraftDay">
-        <include refid="baseQuerySql"/>
-        <where>
-            <if test="tenantId != null"> and tenant_id = #{tenantId}</if>
-            <if test="revision != null "> and revision = #{revision}</if>
-            <if test="createdBy != null and createdBy != ''"> and created_by = #{createdBy}</if>
-            <if test="createdTime != null "> and created_time = #{createdTime}</if>
-            <if test="updatedBy != null and updatedBy != ''"> and updated_by = #{updatedBy}</if>
-            <if test="updatedTime != null "> and updated_time = #{updatedTime}</if>
-            <if test="deleteBy != null and deleteBy != ''"> and delete_by = #{deleteBy}</if>
-            <if test="deleteTime != null"> and delete_time = #{deleteTime}</if>
-            <if test="id != null and id != ''"> and id = #{id}</if>
-            <if test="companyCode != null and companyCode != ''"> and company_code = #{companyCode}</if>
-            <if test="organizeName != null and organizeName != ''"> and organize_name = #{organizeName}</if>
-            <if test="organizeCode != null and organizeCode != ''"> and organize_code = #{organizeCode}</if>
-            <if test="companyName != null and companyName != ''"> and company_name = #{companyName}</if>
-            <if test="assetCode != null and assetCode != ''"> and asset_code = #{assetCode}</if>
-            <if test="assetName != null and assetCode != ''"> and asset_name = #{assetName}</if>
-            <if test="paramCode != null and paramCode != ''"> and param_code = #{paramCode}</if>
-            <if test="paramName != null and paramName != ''"> and param_name = #{paramName}</if>
-            <if test="paramField != null and paramField != ''"> and param_field = #{paramField}</if>
-            <if test="targetUint != null and targetUint != ''"> and target_uint = #{targetUint}</if>
-            <if test="countDate != null and countDate != ''"> and count_date = #{countDate}</if>
-            <if test="valAvg != null"> and val_avg = #{valAvg}</if>
-            <if test="valMax != null"> and val_max = #{valMax}</if>
-            <if test="valSum != null"> and val_sum = #{valSum}</if>
-            <if test="valMin != null"> and val_min = #{valMin}</if>
-            <if test="valIntegrating != null "> and val_integrating = #{valIntegrating}</if>
-            <if test="valLimitUp != null "> and val_limit_up = #{valLimitUp}</if>
-            <if test="valLimitDown != null"> and val_limit_down = #{valLimitDown}</if>
-            <if test="val01 != null "> and val01 = #{val01}</if>
-            <if test="val02 != null "> and val02 = #{val02}</if>
-            <if test="val03 != null"> and val03 = #{val03}</if>
-            <if test="val04 != null "> and val04 = #{val04}</if>
-            <if test="val05 != null "> and val05 = #{val05}</if>
-            <if test="val06 != null "> and val06 = #{val06}</if>
-            <if test="val07 != null "> and val07 = #{val07}</if>
-            <if test="val08 != null "> and val08 = #{val08}</if>
-            <if test="val09 != null "> and val09 = #{val09}</if>
-            <if test="val10 != null "> and val10 = #{val10}</if>
-            <if test="val11 != null "> and val11 = #{val11}</if>
-            <if test="val12 != null "> and val12 = #{val12}</if>
-            <if test="val13 != null "> and val13 = #{val13}</if>
-            <if test="val14 != null "> and val14 = #{val14}</if>
-            <if test="val15 != null "> and val15 = #{val15}</if>
-            <if test="val16 != null "> and val16 = #{val16}</if>
-            <if test="val17 != null "> and val17 = #{val17}</if>
-            <if test="val18 != null "> and val18 = #{val18}</if>
-            <if test="val19 != null "> and val19 = #{val19}</if>
-            <if test="val20 != null "> and val20 = #{val20}</if>
-            <if test="val21 != null "> and val21 = #{val21}</if>
-            <if test="val22 != null "> and val22 = #{val22}</if>
-            <if test="val23 != null "> and val23 = #{val23}</if>
-            <if test="val24 != null "> and val24 = #{val24}</if>
 
+    <select id="selectDcBusiParamDraftDayList" parameterType="DcBusiParamDraftDay" resultMap="DcBusiParamDraftDayResult">
+        <include refid="selectDcBusiParamDraftDayVo"/>
+        <where>  
+            <if test="companyId != null "> and company_id = #{companyId}</if>
+            <if test="organizeId != null "> and organize_id = #{organizeId}</if>
+            <if test="assetCode != null  and assetCode != ''"> and asset_code = #{assetCode}</if>
+            <if test="paramCode != null  and paramCode != ''"> and param_code = #{paramCode}</if>
+            <if test="paramName != null  and paramName != ''"> and param_name like concat('%', #{paramName}, '%')</if>
+            <if test="paramFieldCode != null  and paramFieldCode != ''"> and param_field_code = #{paramFieldCode}</if>
+            <if test="paramFieldName != null  and paramFieldName != ''"> and param_field_name like concat('%', #{paramFieldName}, '%')</if>
+            <if test="targetUint != null  and targetUint != ''"> and target_uint = #{targetUint}</if>
+            <if test="countDate != null  and countDate != ''"> and count_date = #{countDate}</if>
         </where>
     </select>
-    <insert id="insertByVo" parameterType="com.lzbi.draft.domain.DcBusiParamDraftDay">
+    
+    <select id="selectDcBusiParamDraftDayById" parameterType="String" resultMap="DcBusiParamDraftDayResult">
+        <include refid="selectDcBusiParamDraftDayVo"/>
+        where id = #{id}
+    </select>
+    <select id="selectOneByParam" parameterType="ParamDraftQueryVo" resultMap="DcBusiParamDraftDayResult">
+        <include refid="selectDcBusiParamDraftDayVo"/>
+        where id = #{id}
+        <if test="companyId != null "> and company_id = #{companyId}</if>
+        <if test="organizeId != null "> and organize_id = #{organizeId}</if>
+        <if test="assetCode != null  and assetCode != ''"> and asset_code = #{assetCode}</if>
+    </select>
+
+    <insert id="insertDcBusiParamDraftDay" parameterType="DcBusiParamDraftDay" useGeneratedKeys="true" keyProperty="id">
         insert into dc_busi_param_draft_day
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="tenantId != null ">tenant_id,</if>
+            <if test="tenantId != null">tenant_id,</if>
-            <if test="revision != null ">revision,</if>
+            <if test="revision != null">revision,</if>
-            <if test="createdBy != null and createdBy != ''">created_by,</if>
+            <if test="createdBy != null">created_by,</if>
-            <if test="createdTime != null ">created_time,</if>
+            <if test="createdTime != null">created_time,</if>
-            <if test="updatedBy != null and updatedBy != ''">updated_by,</if>
+            <if test="updatedBy != null">updated_by,</if>
-            <if test="updatedTime != null ">updated_time,</if>
+            <if test="updatedTime != null">updated_time,</if>
-            <if test="deleteBy != null and deleteBy != ''">delete_by,</if>
+            <if test="deleteBy != null">delete_by,</if>
             <if test="deleteTime != null">delete_time,</if>
-            <if test="companyCode != null and companyCode != ''">company_code,</if>
+            <if test="companyId != null">company_id,</if>
-            <if test="organizeName != null and organizeName != ''">organize_name,</if>
+            <if test="organizeName != null">organize_name,</if>
-            <if test="organizeCode != null and organizeCode != ''">organize_code,</if>
+            <if test="organizeId != null">organize_id,</if>
-            <if test="companyName != null and companyName != ''">company_name,</if>
+            <if test="companyName != null">company_name,</if>
-            <if test="assetCode != null and assetCode != ''">asset_code,</if>
+            <if test="assetCode != null">asset_code,</if>
-            <if test="assetName != null and assetName != ''">asset_name,</if>
+            <if test="paramCode != null">param_code,</if>
-            <if test="paramCode != null and paramCode != ''">param_code,</if>
+            <if test="paramName != null">param_name,</if>
-            <if test="paramName != null and paramName != ''">param_name,</if>
+            <if test="paramFieldCode != null">param_field_code,</if>
-            <if test="paramField != null and paramField != ''">param_field,</if>
+            <if test="paramFieldName != null">param_field_name,</if>
-            <if test="targetUint != null and targetUint != ''">target_uint,</if>
+            <if test="targetUint != null">target_uint,</if>
-            <if test="countDate != null and countDate != ''">count_date,</if>
+            <if test="countDate != null">count_date,</if>
-            <if test="valAvg != null ">val_avg,</if>
+            <if test="valAvg != null">val_avg,</if>
-            <if test="valMax != null ">val_max,</if>
+            <if test="valMax != null">val_max,</if>
-            <if test="valSum != null ">val_sum,</if>
+            <if test="valSum != null">val_sum,</if>
-            <if test="valMin != null ">val_min,</if>
+            <if test="valMin != null">val_min,</if>
             <if test="valIntegrating != null">val_integrating,</if>
-            <if test="valLimitUp != null ">val_limit_up,</if>
+            <if test="valLimitUp != null">val_limit_up,</if>
-            <if test="valLimitDown != null ">val_limit_down,</if>
+            <if test="valLimitDown != null">val_limit_down,</if>
             <if test="val01 != null">val01,</if>
             <if test="val02 != null">val02,</if>
             <if test="val03 != null">val03,</if>
@@ -273,35 +143,35 @@
             <if test="val22 != null">val22,</if>
             <if test="val23 != null">val23,</if>
             <if test="val24 != null">val24,</if>
-        </trim>
+            <if test="assetName != null">asset_name,</if>
+         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="tenantId != null ">#{tenantId},</if>
+            <if test="tenantId != null">#{tenantId},</if>
-            <if test="revision != null ">#{revision},</if>
+            <if test="revision != null">#{revision},</if>
-            <if test="createdBy != null and createdBy != ''">#{createdBy},</if>
+            <if test="createdBy != null">#{createdBy},</if>
-            <if test="createdTime != null ">#{createdTime},</if>
+            <if test="createdTime != null">#{createdTime},</if>
-            <if test="updatedBy != null and updatedBy != ''">#{updatedBy},</if>
+            <if test="updatedBy != null">#{updatedBy},</if>
-            <if test="updatedTime != null ">#{updatedTime},</if>
+            <if test="updatedTime != null">#{updatedTime},</if>
-            <if test="deleteBy != null and deleteBy != ''">#{deleteBy},</if>
+            <if test="deleteBy != null">#{deleteBy},</if>
-            <if test="deleteTime != null ">#{deleteTime},</if>
+            <if test="deleteTime != null">#{deleteTime},</if>
-            <if test="companyCode != null and companyCode != ''">#{companyCode},</if>
+            <if test="companyId != null">#{companyId},</if>
-            <if test="organizeName != null and organizeName != ''">#{organizeName},</if>
+            <if test="organizeName != null">#{organizeName},</if>
-            <if test="organizeCode != null and organizeCode != ''">#{organizeCode},</if>
+            <if test="organizeId != null">#{organizeId},</if>
-            <if test="companyName != null and companyName != ''">#{companyName},</if>
+            <if test="companyName != null">#{companyName},</if>
-            <if test="assetCode != null and assetCode != ''">#{assetCode},</if>
+            <if test="assetCode != null">#{assetCode},</if>
-            <if test="assetName != null and assetName != ''">#{assetName},</if>
+            <if test="paramCode != null">#{paramCode},</if>
-            <if test="paramCode != null and paramCode != ''">#{paramCode},</if>
+            <if test="paramName != null">#{paramName},</if>
-            <if test="paramName != null and paramName != ''">#{paramName},</if>
+            <if test="paramField != null">#{paramField},</if>
-            <if test="paramField != null and paramField != ''">#{paramField},</if>
+            <if test="targetUint != null">#{targetUint},</if>
-            <if test="targetUint != null and targetUint != ''">#{targetUint},</if>
+            <if test="countDate != null">#{countDate},</if>
-            <if test="countDate != null and countDate != ''">#{countDate},</if>
+            <if test="valAvg != null">#{valAvg},</if>
-            <if test="valAvg != null ">#{valAvg},</if>
+            <if test="valMax != null">#{valMax},</if>
-            <if test="valMax != null ">#{valMax},</if>
+            <if test="valSum != null">#{valSum},</if>
-            <if test="valSum != null ">#{valSum},</if>
+            <if test="valMin != null">#{valMin},</if>
-            <if test="valMin != null ">#{valMin},</if>
+            <if test="valIntegrating != null">#{valIntegrating},</if>
-            <if test="valIntegrating != null ">#{valIntegrating},</if>
+            <if test="valLimitUp != null">#{valLimitUp},</if>
-            <if test="valLimitUp != null ">#{valLimitUp},</if>
             <if test="valLimitDown != null">#{valLimitDown},</if>
-            <if test="val01 != null ">#{val01},</if>
+            <if test="val01 != null">#{val01},</if>
             <if test="val02 != null">#{val02},</if>
             <if test="val03 != null">#{val03},</if>
             <if test="val04 != null">#{val04},</if>
@@ -325,16 +195,76 @@
             <if test="val22 != null">#{val22},</if>
             <if test="val23 != null">#{val23},</if>
             <if test="val24 != null">#{val24},</if>
-        </trim>
+            <if test="assetName != null">#{assetName},</if>
+         </trim>
     </insert>
-    <select id="selectOneByParam" resultMap="rmDcBusiParamDraftDay" parameterType="ParamDraftQueryVo">
+
-        <include refid="baseQuerySql"></include>
+    <update id="updateDcBusiParamDraftDay" parameterType="DcBusiParamDraftDay">
-        <where>
+        update dc_busi_param_draft_day
-            <if test="assetCode != null and assetCode != ''"> and asset_code = #{assetCode}</if>
+        <trim prefix="SET" suffixOverrides=",">
-            <if test="assetParamCode != null and assetParamCode != ''"> and param_code = #{assetParamCode}</if>
+            <if test="tenantId != null">tenant_id = #{tenantId},</if>
-            <if test="specialCode != null and specialCode != ''"> and param_field = #{specialCode}</if>
+            <if test="revision != null">revision = #{revision},</if>
-            <if test="countDate != null and countDate != ''"> and count_date = #{countDate}</if>
+            <if test="createdBy != null">created_by = #{createdBy},</if>
-        </where>
+            <if test="createdTime != null">created_time = #{createdTime},</if>
-        limit 1
+            <if test="updatedBy != null">updated_by = #{updatedBy},</if>
-    </select>
+            <if test="updatedTime != null">updated_time = #{updatedTime},</if>
+            <if test="deleteBy != null">delete_by = #{deleteBy},</if>
+            <if test="deleteTime != null">delete_time = #{deleteTime},</if>
+            <if test="companyId != null">company_id = #{companyId},</if>
+            <if test="organizeName != null">organize_name = #{organizeName},</if>
+            <if test="organizeId != null">organize_id = #{organizeId},</if>
+            <if test="companyName != null">company_name = #{companyName},</if>
+            <if test="assetCode != null">asset_code = #{assetCode},</if>
+            <if test="paramCode != null">param_code = #{paramCode},</if>
+            <if test="paramName != null">param_name = #{paramName},</if>
+            <if test="paramFieldCode != null">param_field_code = #{paramFieldCode},</if>
+            <if test="paramFieldName != null">param_field_name = #{paramFieldName},</if>
+            <if test="targetUint != null">target_uint = #{targetUint},</if>
+            <if test="countDate != null">count_date = #{countDate},</if>
+            <if test="valAvg != null">val_avg = #{valAvg},</if>
+            <if test="valMax != null">val_max = #{valMax},</if>
+            <if test="valSum != null">val_sum = #{valSum},</if>
+            <if test="valMin != null">val_min = #{valMin},</if>
+            <if test="valIntegrating != null">val_integrating = #{valIntegrating},</if>
+            <if test="valLimitUp != null">val_limit_up = #{valLimitUp},</if>
+            <if test="valLimitDown != null">val_limit_down = #{valLimitDown},</if>
+            <if test="val01 != null">val01 = #{val01},</if>
+            <if test="val02 != null">val02 = #{val02},</if>
+            <if test="val03 != null">val03 = #{val03},</if>
+            <if test="val04 != null">val04 = #{val04},</if>
+            <if test="val05 != null">val05 = #{val05},</if>
+            <if test="val06 != null">val06 = #{val06},</if>
+            <if test="val07 != null">val07 = #{val07},</if>
+            <if test="val08 != null">val08 = #{val08},</if>
+            <if test="val09 != null">val09 = #{val09},</if>
+            <if test="val10 != null">val10 = #{val10},</if>
+            <if test="val11 != null">val11 = #{val11},</if>
+            <if test="val12 != null">val12 = #{val12},</if>
+            <if test="val13 != null">val13 = #{val13},</if>
+            <if test="val14 != null">val14 = #{val14},</if>
+            <if test="val15 != null">val15 = #{val15},</if>
+            <if test="val16 != null">val16 = #{val16},</if>
+            <if test="val17 != null">val17 = #{val17},</if>
+            <if test="val18 != null">val18 = #{val18},</if>
+            <if test="val19 != null">val19 = #{val19},</if>
+            <if test="val20 != null">val20 = #{val20},</if>
+            <if test="val21 != null">val21 = #{val21},</if>
+            <if test="val22 != null">val22 = #{val22},</if>
+            <if test="val23 != null">val23 = #{val23},</if>
+            <if test="val24 != null">val24 = #{val24},</if>
+            <if test="assetName != null">asset_name = #{assetName},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteDcBusiParamDraftDayById" parameterType="String">
+        delete from dc_busi_param_draft_day where id = #{id}
+    </delete>
+
+    <delete id="deleteDcBusiParamDraftDayByIds" parameterType="String">
+        delete from dc_busi_param_draft_day where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
 </mapper>

lzbi-module/src/main/resources/mapper/draft/DcBusiTargetDraftMonthMapper.xml

@@ -0,0 +1,288 @@
+<?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.lzbi.draft.mapper.DcBusiTargetDraftMonthMapper">
+    
+    <resultMap type="com.lzbi.draft.domain.DcBusiTargetDraftMonth" id="DcBusiTargetDraftMonthResult">
+        <result property="id"    column="id"    />
+        <result property="companyName"    column="company_name"    />
+        <result property="companyId"    column="company_id"    />
+        <result property="orgId"    column="org_id"    />
+        <result property="orgName"    column="org_name"    />
+        <result property="assetCode"    column="asset_code"    />
+        <result property="assetName"    column="asset_name"    />
+        <result property="fieldCode"    column="field_code"    />
+        <result property="fieldName"    column="field_name"    />
+        <result property="targetNameAlias"    column="target_name_alias"    />
+        <result property="targetName"    column="target_name"    />
+        <result property="targetCode"    column="target_code"    />
+        <result property="targetUint"    column="target_uint"    />
+        <result property="countYear"    column="count_year"    />
+        <result property="countMonth"    column="count_month"    />
+        <result property="valSum"    column="val_sum"    />
+        <result property="valAvgAll"    column="val_avg_all"    />
+        <result property="valAvgNull"    column="val_avg_null"    />
+        <result property="valPlan"    column="val_plan"    />
+        <result property="tenantId"    column="tenant_id"    />
+        <result property="revision"    column="revision"    />
+        <result property="createdBy"    column="created_by"    />
+        <result property="createdTime"    column="created_time"    />
+        <result property="updatedBy"    column="updated_by"    />
+        <result property="updatedTime"    column="updated_time"    />
+        <result property="deleteBy"    column="delete_by"    />
+        <result property="deleteTime"    column="delete_time"    />
+        <result property="valP1"    column="val_p1"    />
+        <result property="valP2"    column="val_p2"    />
+        <result property="valP3"    column="val_p3"    />
+        <result property="valP4"    column="val_p4"    />
+        <result property="valP5"    column="val_p5"    />
+        <result property="valP6"    column="val_p6"    />
+        <result property="valP7"    column="val_p7"    />
+        <result property="valP8"    column="val_p8"    />
+        <result property="valP9"    column="val_p9"    />
+        <result property="valP10"    column="val_p10"    />
+        <result property="valP11"    column="val_p11"    />
+        <result property="valP12"    column="val_p12"    />
+        <result property="valP13"    column="val_p13"    />
+        <result property="valP14"    column="val_p14"    />
+        <result property="valP15"    column="val_p15"    />
+        <result property="valP16"    column="val_p16"    />
+        <result property="valP17"    column="val_p17"    />
+        <result property="valP18"    column="val_p18"    />
+        <result property="valP19"    column="val_p19"    />
+        <result property="valP20"    column="val_p20"    />
+        <result property="valP21"    column="val_p21"    />
+        <result property="valP22"    column="val_p22"    />
+        <result property="valP23"    column="val_p23"    />
+        <result property="valP24"    column="val_p24"    />
+        <result property="valP25"    column="val_p25"    />
+        <result property="valP26"    column="val_p26"    />
+        <result property="valP27"    column="val_p27"    />
+        <result property="valP28"    column="val_p28"    />
+        <result property="valP29"    column="val_p29"    />
+        <result property="valP30"    column="val_p30"    />
+        <result property="valP31"    column="val_p31"    />
+    </resultMap>
+
+    <sql id="selectDcBusiTargetDraftMonthVo">
+        select id, company_name, company_id, org_id, org_name, asset_code, asset_name, field_code, field_name, target_name_alias, target_name, target_code, target_uint, count_year, count_month, val_sum, val_avg_all, val_avg_null, val_plan, tenant_id, revision, created_by, created_time, updated_by, updated_time, delete_by, delete_time, val_p1, val_p2, val_p3, val_p4, val_p5, val_p6, val_p7, val_p8, val_p9, val_p10, val_p11, val_p12, val_p13, val_p14, val_p15, val_p16, val_p17, val_p18, val_p19, val_p20, val_p21, val_p22, val_p23, val_p24, val_p25, val_p26, val_p27, val_p28, val_p29, val_p30, val_p31 from dc_busi_target_draft_month
+    </sql>
+
+    <select id="selectDcBusiTargetDraftMonthList" parameterType="DcBusiTargetDraftMonth" resultMap="DcBusiTargetDraftMonthResult">
+        <include refid="selectDcBusiTargetDraftMonthVo"/>
+        <where>  
+            <if test="companyId != null "> and company_id = #{companyId}</if>
+            <if test="orgId != null "> and org_id = #{orgId}</if>
+            <if test="assetCode != null  and assetCode != ''"> and asset_code = #{assetCode}</if>
+            <if test="fieldCode != null  and fieldCode != ''"> and field_code = #{fieldCode}</if>
+            <if test="targetName != null  and targetName != ''"> and target_name like concat('%', #{targetName}, '%')</if>
+            <if test="targetCode != null  and targetCode != ''"> and target_code = #{targetCode}</if>
+            <if test="countYear != null  and countYear != ''"> and count_year = #{countYear}</if>
+            <if test="countMonth != null  and countMonth != ''"> and count_month = #{countMonth}</if>
+            <if test="valP1 != null "> and val_p1 = #{valP1}</if>
+        </where>
+    </select>
+    
+    <select id="selectDcBusiTargetDraftMonthById" parameterType="Long" resultMap="DcBusiTargetDraftMonthResult">
+        <include refid="selectDcBusiTargetDraftMonthVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertDcBusiTargetDraftMonth" parameterType="DcBusiTargetDraftMonth" useGeneratedKeys="true" keyProperty="id">
+        insert into dc_busi_target_draft_month
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="companyName != null">company_name,</if>
+            <if test="companyId != null">company_id,</if>
+            <if test="orgId != null">org_id,</if>
+            <if test="orgName != null">org_name,</if>
+            <if test="assetCode != null">asset_code,</if>
+            <if test="assetName != null">asset_name,</if>
+            <if test="fieldCode != null">field_code,</if>
+            <if test="fieldName != null">field_name,</if>
+            <if test="targetNameAlias != null">target_name_alias,</if>
+            <if test="targetName != null">target_name,</if>
+            <if test="targetCode != null">target_code,</if>
+            <if test="targetUint != null">target_uint,</if>
+            <if test="countYear != null">count_year,</if>
+            <if test="countMonth != null">count_month,</if>
+            <if test="valSum != null">val_sum,</if>
+            <if test="valAvgAll != null">val_avg_all,</if>
+            <if test="valAvgNull != null">val_avg_null,</if>
+            <if test="valPlan != null">val_plan,</if>
+            <if test="tenantId != null">tenant_id,</if>
+            <if test="revision != null">revision,</if>
+            <if test="createdBy != null">created_by,</if>
+            <if test="createdTime != null">created_time,</if>
+            <if test="updatedBy != null">updated_by,</if>
+            <if test="updatedTime != null">updated_time,</if>
+            <if test="deleteBy != null">delete_by,</if>
+            <if test="deleteTime != null">delete_time,</if>
+            <if test="valP1 != null">val_p1,</if>
+            <if test="valP2 != null">val_p2,</if>
+            <if test="valP3 != null">val_p3,</if>
+            <if test="valP4 != null">val_p4,</if>
+            <if test="valP5 != null">val_p5,</if>
+            <if test="valP6 != null">val_p6,</if>
+            <if test="valP7 != null">val_p7,</if>
+            <if test="valP8 != null">val_p8,</if>
+            <if test="valP9 != null">val_p9,</if>
+            <if test="valP10 != null">val_p10,</if>
+            <if test="valP11 != null">val_p11,</if>
+            <if test="valP12 != null">val_p12,</if>
+            <if test="valP13 != null">val_p13,</if>
+            <if test="valP14 != null">val_p14,</if>
+            <if test="valP15 != null">val_p15,</if>
+            <if test="valP16 != null">val_p16,</if>
+            <if test="valP17 != null">val_p17,</if>
+            <if test="valP18 != null">val_p18,</if>
+            <if test="valP19 != null">val_p19,</if>
+            <if test="valP20 != null">val_p20,</if>
+            <if test="valP21 != null">val_p21,</if>
+            <if test="valP22 != null">val_p22,</if>
+            <if test="valP23 != null">val_p23,</if>
+            <if test="valP24 != null">val_p24,</if>
+            <if test="valP25 != null">val_p25,</if>
+            <if test="valP26 != null">val_p26,</if>
+            <if test="valP27 != null">val_p27,</if>
+            <if test="valP28 != null">val_p28,</if>
+            <if test="valP29 != null">val_p29,</if>
+            <if test="valP30 != null">val_p30,</if>
+            <if test="valP31 != null">val_p31,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="companyName != null">#{companyName},</if>
+            <if test="companyId != null">#{companyId},</if>
+            <if test="orgId != null">#{orgId},</if>
+            <if test="orgName != null">#{orgName},</if>
+            <if test="assetCode != null">#{assetCode},</if>
+            <if test="assetName != null">#{assetName},</if>
+            <if test="fieldCode != null">#{fieldCode},</if>
+            <if test="fieldName != null">#{fieldName},</if>
+            <if test="targetNameAlias != null">#{targetNameAlias},</if>
+            <if test="targetName != null">#{targetName},</if>
+            <if test="targetCode != null">#{targetCode},</if>
+            <if test="targetUint != null">#{targetUint},</if>
+            <if test="countYear != null">#{countYear},</if>
+            <if test="countMonth != null">#{countMonth},</if>
+            <if test="valSum != null">#{valSum},</if>
+            <if test="valAvgAll != null">#{valAvgAll},</if>
+            <if test="valAvgNull != null">#{valAvgNull},</if>
+            <if test="valPlan != null">#{valPlan},</if>
+            <if test="tenantId != null">#{tenantId},</if>
+            <if test="revision != null">#{revision},</if>
+            <if test="createdBy != null">#{createdBy},</if>
+            <if test="createdTime != null">#{createdTime},</if>
+            <if test="updatedBy != null">#{updatedBy},</if>
+            <if test="updatedTime != null">#{updatedTime},</if>
+            <if test="deleteBy != null">#{deleteBy},</if>
+            <if test="deleteTime != null">#{deleteTime},</if>
+            <if test="valP1 != null">#{valP1},</if>
+            <if test="valP2 != null">#{valP2},</if>
+            <if test="valP3 != null">#{valP3},</if>
+            <if test="valP4 != null">#{valP4},</if>
+            <if test="valP5 != null">#{valP5},</if>
+            <if test="valP6 != null">#{valP6},</if>
+            <if test="valP7 != null">#{valP7},</if>
+            <if test="valP8 != null">#{valP8},</if>
+            <if test="valP9 != null">#{valP9},</if>
+            <if test="valP10 != null">#{valP10},</if>
+            <if test="valP11 != null">#{valP11},</if>
+            <if test="valP12 != null">#{valP12},</if>
+            <if test="valP13 != null">#{valP13},</if>
+            <if test="valP14 != null">#{valP14},</if>
+            <if test="valP15 != null">#{valP15},</if>
+            <if test="valP16 != null">#{valP16},</if>
+            <if test="valP17 != null">#{valP17},</if>
+            <if test="valP18 != null">#{valP18},</if>
+            <if test="valP19 != null">#{valP19},</if>
+            <if test="valP20 != null">#{valP20},</if>
+            <if test="valP21 != null">#{valP21},</if>
+            <if test="valP22 != null">#{valP22},</if>
+            <if test="valP23 != null">#{valP23},</if>
+            <if test="valP24 != null">#{valP24},</if>
+            <if test="valP25 != null">#{valP25},</if>
+            <if test="valP26 != null">#{valP26},</if>
+            <if test="valP27 != null">#{valP27},</if>
+            <if test="valP28 != null">#{valP28},</if>
+            <if test="valP29 != null">#{valP29},</if>
+            <if test="valP30 != null">#{valP30},</if>
+            <if test="valP31 != null">#{valP31},</if>
+         </trim>
+    </insert>
+
+    <update id="updateDcBusiTargetDraftMonth" parameterType="DcBusiTargetDraftMonth">
+        update dc_busi_target_draft_month
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="companyName != null">company_name = #{companyName},</if>
+            <if test="companyId != null">company_id = #{companyId},</if>
+            <if test="orgId != null">org_id = #{orgId},</if>
+            <if test="orgName != null">org_name = #{orgName},</if>
+            <if test="assetCode != null">asset_code = #{assetCode},</if>
+            <if test="assetName != null">asset_name = #{assetName},</if>
+            <if test="fieldCode != null">field_code = #{fieldCode},</if>
+            <if test="fieldName != null">field_name = #{fieldName},</if>
+            <if test="targetNameAlias != null">target_name_alias = #{targetNameAlias},</if>
+            <if test="targetName != null">target_name = #{targetName},</if>
+            <if test="targetCode != null">target_code = #{targetCode},</if>
+            <if test="targetUint != null">target_uint = #{targetUint},</if>
+            <if test="countYear != null">count_year = #{countYear},</if>
+            <if test="countMonth != null">count_month = #{countMonth},</if>
+            <if test="valSum != null">val_sum = #{valSum},</if>
+            <if test="valAvgAll != null">val_avg_all = #{valAvgAll},</if>
+            <if test="valAvgNull != null">val_avg_null = #{valAvgNull},</if>
+            <if test="valPlan != null">val_plan = #{valPlan},</if>
+            <if test="tenantId != null">tenant_id = #{tenantId},</if>
+            <if test="revision != null">revision = #{revision},</if>
+            <if test="createdBy != null">created_by = #{createdBy},</if>
+            <if test="createdTime != null">created_time = #{createdTime},</if>
+            <if test="updatedBy != null">updated_by = #{updatedBy},</if>
+            <if test="updatedTime != null">updated_time = #{updatedTime},</if>
+            <if test="deleteBy != null">delete_by = #{deleteBy},</if>
+            <if test="deleteTime != null">delete_time = #{deleteTime},</if>
+            <if test="valP1 != null">val_p1 = #{valP1},</if>
+            <if test="valP2 != null">val_p2 = #{valP2},</if>
+            <if test="valP3 != null">val_p3 = #{valP3},</if>
+            <if test="valP4 != null">val_p4 = #{valP4},</if>
+            <if test="valP5 != null">val_p5 = #{valP5},</if>
+            <if test="valP6 != null">val_p6 = #{valP6},</if>
+            <if test="valP7 != null">val_p7 = #{valP7},</if>
+            <if test="valP8 != null">val_p8 = #{valP8},</if>
+            <if test="valP9 != null">val_p9 = #{valP9},</if>
+            <if test="valP10 != null">val_p10 = #{valP10},</if>
+            <if test="valP11 != null">val_p11 = #{valP11},</if>
+            <if test="valP12 != null">val_p12 = #{valP12},</if>
+            <if test="valP13 != null">val_p13 = #{valP13},</if>
+            <if test="valP14 != null">val_p14 = #{valP14},</if>
+            <if test="valP15 != null">val_p15 = #{valP15},</if>
+            <if test="valP16 != null">val_p16 = #{valP16},</if>
+            <if test="valP17 != null">val_p17 = #{valP17},</if>
+            <if test="valP18 != null">val_p18 = #{valP18},</if>
+            <if test="valP19 != null">val_p19 = #{valP19},</if>
+            <if test="valP20 != null">val_p20 = #{valP20},</if>
+            <if test="valP21 != null">val_p21 = #{valP21},</if>
+            <if test="valP22 != null">val_p22 = #{valP22},</if>
+            <if test="valP23 != null">val_p23 = #{valP23},</if>
+            <if test="valP24 != null">val_p24 = #{valP24},</if>
+            <if test="valP25 != null">val_p25 = #{valP25},</if>
+            <if test="valP26 != null">val_p26 = #{valP26},</if>
+            <if test="valP27 != null">val_p27 = #{valP27},</if>
+            <if test="valP28 != null">val_p28 = #{valP28},</if>
+            <if test="valP29 != null">val_p29 = #{valP29},</if>
+            <if test="valP30 != null">val_p30 = #{valP30},</if>
+            <if test="valP31 != null">val_p31 = #{valP31},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteDcBusiTargetDraftMonthById" parameterType="Long">
+        delete from dc_busi_target_draft_month where id = #{id}
+    </delete>
+
+    <delete id="deleteDcBusiTargetDraftMonthByIds" parameterType="String">
+        delete from dc_busi_target_draft_month where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>