资产指标调整单审核接口

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

@@ -5,6 +5,10 @@ import javax.servlet.http.HttpServletResponse;
 
 import com.lzbi.draft.domain.DcBusiTargetAdjustDayMasterDao;
 import com.lzbi.draft.service.DcBusiTargetAdjustDayMasterService;
+import io.swagger.annotations.Api;
+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;
@@ -28,6 +32,7 @@ import com.lzbi.common.core.page.TableDataInfo;
  * @author lienbo
  * @date 2023-12-05
  */
+@Api(value = "资产指标调整单",tags = "资产指标调整单")
 @RestController
 @RequestMapping("/asset/target/adjust")
 public class DcBusiTargetAdjustDayMasterController extends BaseController
@@ -73,6 +78,7 @@ public class DcBusiTargetAdjustDayMasterController extends BaseController
     /**
      * 新增资产指标调整单主(日)
      */
+    @ApiOperation("新增资产指标调整单")
     @PreAuthorize("@ss.hasPermi('lzbi:master:add')")
     @Log(title = "资产指标调整单主(日)", businessType = BusinessType.INSERT)
     @PostMapping
@@ -102,4 +108,18 @@ public class DcBusiTargetAdjustDayMasterController extends BaseController
     {
         return toAjax(dcBusiTargetAdjustDayMasterService.deleteDcBusiTargetAdjustDayMasterDaoByIds(ids));
     }
+
+    /**
+     * 新增资产指标调整单主(日)
+     */
+    @ApiOperation("审核资产指标调整单")
+    @ApiImplicitParam(name = "id", value = "id", dataType = "Long", dataTypeClass = Long.class, paramType = "path")
+    @PreAuthorize("@ss.hasPermi('lzbi:master:add')")
+    @Log(title = "资产指标调整单主(日)", businessType = BusinessType.OTHER)
+    @PostMapping("/{id}")
+    public AjaxResult audit(@PathVariable("id") Long id)
+    {
+        return toAjax(dcBusiTargetAdjustDayMasterService.audit(id));
+    }
+
 }

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

@@ -4,88 +4,167 @@ import java.util.Date;
 import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 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;
+import springfox.documentation.annotations.ApiIgnore;
 
 /**
  * 资产指标调整单主(日)对象 dc_busi_target_adjust_day_master
- * 
+ *
  * @author win
  * @date 2023-12-05
  */
- @Data
+@ApiModel(value = "DcBusiTargetAdjustDayMasterDao对象", description = "资产指标调整单主表对象")
-public class DcBusiTargetAdjustDayMasterDao extends BaseModuleEntity
+@Data
-{
+public class DcBusiTargetAdjustDayMasterDao extends BaseModuleEntity {
-    /** 待审核状态 */
+    /**
+     * 待审核状态
+     */
     public static final String CHECK_STATUS_PENDING_CHECK = "0";
-    /** 人工 */
+    /**
+     * 已审核状态
+     */
+    public static final String CHECK_STATUS_CHECKED = "1";
+    /**
+     * 已审核状态
+     */
+    public static final String CHECK_STATUS_PROCESSED = "2";
+    /**
+     * 人工
+     */
     public static final String CHECK_TYPE_ARTIFICIAL = "0";
 
     private static final long serialVersionUID = 1L;
 
-    /** 单据号 */
+    /**
+     * 单据号
+     */
+    @ApiModelProperty(value = "单据号", dataType = "String")
     @Excel(name = "单据号")
     private String billSerial;
 
-    /** 单据类别 */
+    /**
+     * 单据类别
+     */
+    @ApiModelProperty(value = "单据类别", dataType = "String")
     @Excel(name = "单据类别")
     private String biilType;
 
-    /** 公司ID */
+    /**
+     * 公司ID
+     */
+    @ApiModelProperty(value = "公司ID", dataType = "Long")
     @Excel(name = "公司ID")
     private Long companyId;
 
-    /** 公司名称 */
+    /**
+     * 公司名称
+     */
+    @ApiModelProperty(hidden = true)
     @Excel(name = "公司名称")
     private String companyName;
 
-    /** 组织机构名称 */
+    /**
+     * 组织机构名称
+     */
+    @ApiModelProperty(hidden = true)
     @Excel(name = "组织机构名称")
     private String organizeName;
 
-    /** 组织机构ID */
+    /**
+     * 组织机构ID
+     */
+    @ApiModelProperty(value = "组织机构ID", dataType = "String")
     @Excel(name = "组织机构ID")
     private Long oragnizeId;
 
-    /** 统计单元编码 */
+    /**
+     * 统计单元编码
+     */
+    @ApiModelProperty(value = "统计单元编码", dataType = "String")
     @Excel(name = "统计单元编码")
     private String assetCode;
 
-    /** 统计单元名称 */
+    /**
+     * 统计单元名称
+     */
+    @ApiModelProperty(hidden = true)
     @Excel(name = "统计单元名称")
     private String assetName;
 
-    /** 主键 */
+    /**
+     * 统计专业代码
+     */
+    @ApiModelProperty(value = "统计专业代码", dataType = "String")
+    @Excel(name = "统计专业代码")
+    private String fieldCode;
+
+    /**
+     * 统计专业名称
+     */
+    @ApiModelProperty(hidden = true)
+    @Excel(name = "统计专业名称")
+    private String fieldName;
+
+    /**
+     * 主键
+     */
     private Long id;
 
-    /** 调整目标日期 */
+    /**
+     * 调整目标日期
+     */
+    @ApiModelProperty(value = "调整目标日期", dataType = "String")
     @Excel(name = "调整目标日期")
     private String dateAdjust;
 
-    /** 创建人 */
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(hidden = true)
     private String createdBy;
 
-    /** 创建时间 */
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(hidden = true)
     private Date createdTime;
 
-    /** 更新人 */
+    /**
+     * 更新人
+     */
+    @ApiModelProperty(hidden = true)
     private String updatedBy;
 
-    /** 更新时间 */
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(hidden = true)
     private Date updatedTime;
 
-    /** 审核状态;0待审核 1 已经审核 2已处理 */
+    /**
+     * 审核状态;0待审核 1 已经审核 2已处理
+     */
+    @ApiModelProperty(hidden = true)
     @Excel(name = "审核状态;0待审核 1 已经审核 2已处理")
     private String checkStauts;
 
-    /** 审核类型;1人工2自动 */
+    /**
+     * 审核类型;1人工2自动
+     */
+    @ApiModelProperty(hidden = true)
     @Excel(name = "审核类型;1人工2自动")
     private String checkType;
 
-    /** 统计单元指标调整单子表集合 */
+    /**
+     * 统计单元指标调整单子表集合
+     */
+    @ApiModelProperty(value = "统计单元指标调整单子表集合", dataType = "DcBusiTargetAdjustDaySubDao")
     private List<DcBusiTargetAdjustDaySubDao> children;
 
 }

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

@@ -3,6 +3,8 @@ package com.lzbi.draft.domain;
 import java.math.BigDecimal;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import lombok.Data;
@@ -15,59 +17,73 @@ import com.lzbi.module.base.BaseModuleEntity;
  * @author win
  * @date 2023-12-05
  */
+@ApiModel(value = "DcBusiTargetAdjustDaySubDao对象", description = "资产指标调整单子表对象")
  @Data
 public class DcBusiTargetAdjustDaySubDao extends BaseModuleEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** 创建人 */
+    @ApiModelProperty(hidden = true)
     private String createdBy;
 
     /** 创建时间 */
+    @ApiModelProperty(hidden = true)
     private Date createdTime;
 
     /** 更新人 */
+    @ApiModelProperty(hidden = true)
     private String updatedBy;
 
     /** 更新时间 */
+    @ApiModelProperty(hidden = true)
     private Date updatedTime;
 
     /** 主键 */
     private Long id;
 
     /** 主单据编号 */
+    @ApiModelProperty(hidden = true)
     @Excel(name = "主单据编号")
     private String billNoMaster;
 
     /** 指标编码 */
+    @ApiModelProperty(value = "指标编码")
     @Excel(name = "指标编码")
     private String targetCode;
 
     /** 指标名称 */
+    @ApiModelProperty(hidden = true)
     @Excel(name = "指标名称")
     private String targetName;
 
     /** 指标单位 */
+    @ApiModelProperty(value = "指标单位")
     @Excel(name = "指标单位")
     private String tagetUnit;
 
     /** 日期调整日期 */
+    @ApiModelProperty(value = "日期调整日期")
     @Excel(name = "日期调整日期")
     private String adjustDate;
 
     /** 调整时间 */
+    @ApiModelProperty(value = "调整时间")
     @Excel(name = "调整时间")
     private Long adjstTime;
 
     /** 原值 */
+    @ApiModelProperty(value = "原值")
     @Excel(name = "原值")
     private BigDecimal valOrigin;
 
     /** 调整值 */
+    @ApiModelProperty(value = "调整值")
     @Excel(name = "调整值")
     private BigDecimal valAdjust;
 
     /** 结果值 */
+    @ApiModelProperty(value = "结果值")
     @Excel(name = "结果值")
     private BigDecimal valResult;
 

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

@@ -2,6 +2,7 @@ package com.lzbi.draft.mapper;
 
 import java.util.List;
 
+import com.lzbi.draft.domain.DcBusiTargetAdjustDaySubDao;
 import com.lzbi.draft.domain.DcBusiTargetDraftDayDao;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 

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

@@ -8,7 +8,12 @@ import com.lzbi.common.core.domain.entity.SysDept;
 import com.lzbi.common.utils.DateUtils;
 import com.lzbi.draft.domain.DcBusiTargetAdjustDayMasterDao;
 import com.lzbi.draft.domain.DcBusiTargetAdjustDaySubDao;
+import com.lzbi.draft.domain.DcBusiTargetDraftDayDao;
 import com.lzbi.draft.mapper.DcBusiTargetAdjustDayMasterMapper;
+import com.lzbi.draft.mapper.DcBusiTargetAdjustDaySubMapper;
+import com.lzbi.draft.mapper.DcBusiTargetDraftDayMapper;
+import com.lzbi.special.domain.DcBaseWorkSpecial;
+import com.lzbi.special.mapper.DcBaseWorkSpecialMapper;
 import com.lzbi.system.service.impl.SysDeptServiceImpl;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,6 +42,15 @@ public class DcBusiTargetAdjustDayMasterService extends ServiceImpl<DcBusiTarget
     @Autowired
     private DcBusiTargetAdjustDaySubService dcBusiTargetAdjustDaySubService;
 
+    @Resource
+    private DcBusiTargetAdjustDaySubMapper dcBusiTargetAdjustDaySubMapper;
+
+    @Resource
+    private DcBaseWorkSpecialMapper dcBaseWorkSpecialMapper;
+
+    @Resource
+    private DcBusiTargetDraftDayMapper dcBusiTargetDraftDayMapper;
+
     /**
      * 查询资产指标调整单主(日)
      * 
@@ -69,12 +83,12 @@ public class DcBusiTargetAdjustDayMasterService extends ServiceImpl<DcBusiTarget
     public int insertDcBusiTargetAdjustDayMasterDao(DcBusiTargetAdjustDayMasterDao dcBusiTargetAdjustDayMasterDao)
     {
         String assetCode = dcBusiTargetAdjustDayMasterDao.getAssetCode();
-        // 公司
+        // 查询公司
         SysDept company = sysDeptService.selectDeptById(dcBusiTargetAdjustDayMasterDao.getCompanyId());
         if (ObjectUtils.isNotEmpty(company)) {
             dcBusiTargetAdjustDayMasterDao.setCompanyName(company.getDeptName());
         }
-        // 组织
+        // 查询组织
         SysDept organize = sysDeptService.selectDeptById(dcBusiTargetAdjustDayMasterDao.getOragnizeId());
         if (ObjectUtils.isNotEmpty(organize)) {
             dcBusiTargetAdjustDayMasterDao.setOrganizeName(organize.getDeptName());
@@ -84,6 +98,11 @@ public class DcBusiTargetAdjustDayMasterService extends ServiceImpl<DcBusiTarget
         if (ObjectUtils.isNotEmpty(dcBaseAssetInfo)) {
             dcBusiTargetAdjustDayMasterDao.setAssetName(dcBaseAssetInfo.getAssetName());
         }
+        // 查询生产专业
+        DcBaseWorkSpecial dcBaseWorkSpecial = dcBaseWorkSpecialMapper.selectDcBaseWorkSpecialBySpecialCode(dcBusiTargetAdjustDayMasterDao.getFieldCode());
+        if (ObjectUtils.isNotEmpty(dcBaseWorkSpecial)) {
+            dcBusiTargetAdjustDayMasterDao.setFieldName(dcBaseWorkSpecial.getSpecialName());
+        }
         dcBusiTargetAdjustDayMasterDao.setCheckStauts(DcBusiTargetAdjustDayMasterDao.CHECK_STATUS_PENDING_CHECK);
         dcBusiTargetAdjustDayMasterDao.setCheckType(DcBusiTargetAdjustDayMasterDao.CHECK_TYPE_ARTIFICIAL);
         dcBusiTargetAdjustDayMasterDao.setCreatedTime(DateUtils.getNowDate());
@@ -133,4 +152,42 @@ public class DcBusiTargetAdjustDayMasterService extends ServiceImpl<DcBusiTarget
     {
         return baseMapper.deleteDcBusiTargetAdjustDayMasterDaoById(id);
     }
+
+    /**
+     * 审核资产指标调整单
+     *
+     * @param id 资产指标调整单主(日)主键
+     * @return
+     */
+    public int audit(Long id) {
+        DcBusiTargetAdjustDayMasterDao dcBusiTargetAdjustDayMasterDao = new DcBusiTargetAdjustDayMasterDao();
+        dcBusiTargetAdjustDayMasterDao.setId(id);
+        dcBusiTargetAdjustDayMasterDao.setCheckStauts(DcBusiTargetAdjustDayMasterDao.CHECK_STATUS_CHECKED);
+        return this.updateDcBusiTargetAdjustDayMasterDao(dcBusiTargetAdjustDayMasterDao);
+    }
+
+    /**
+     * 审核资产指标调整单
+     *
+     * @param id
+     * @return
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public int dispose(Long id) {
+        // 查询审核资产指标调整单主表数据
+        DcBusiTargetAdjustDayMasterDao dcBusiTargetAdjustDayMasterDao = baseMapper.selectDcBusiTargetAdjustDayMasterDaoById(id);
+        // 查询审核资产指标调整单子表集合
+        DcBusiTargetAdjustDaySubDao params = new DcBusiTargetAdjustDaySubDao();
+        params.setBillNoMaster(dcBusiTargetAdjustDayMasterDao.getBillSerial());
+        List<DcBusiTargetAdjustDaySubDao> dcBusiTargetAdjustDaySubDaoList = dcBusiTargetAdjustDaySubMapper.selectDcBusiTargetAdjustDaySubDaoList(params);
+        // 遍历子表集合，向指标数据底稿表(日)中同步数据
+        for (DcBusiTargetAdjustDaySubDao dcBusiTargetAdjustDaySubDao : dcBusiTargetAdjustDaySubDaoList) {
+            DcBusiTargetDraftDayDao dcBusiTargetDraftDayDao = new DcBusiTargetDraftDayDao();
+//            dcBusiTargetDraftDayDao.setCompanyCode();
+//            dcBusiTargetDraftDayMapper.disposeDcBusiTargetDraftDayDao(dcBusiTargetAdjustDaySubDao);
+        }
+        // 修改审核状态为已处理
+        dcBusiTargetAdjustDayMasterDao.setCheckStauts(DcBusiTargetAdjustDayMasterDao.CHECK_STATUS_PROCESSED);
+        return this.updateDcBusiTargetAdjustDayMasterDao(dcBusiTargetAdjustDayMasterDao);
+    }
 }

lzbi-module/src/main/java/com/lzbi/special/mapper/DcBaseWorkSpecialMapper.java

@@ -23,6 +23,14 @@ public interface DcBaseWorkSpecialMapper extends BaseMapper<DcBaseWorkSpecial>
      */
     public DcBaseWorkSpecial selectDcBaseWorkSpecialById(Long id);
 
+    /**
+     * 查询生产专业管理
+     *
+     * @param specialCode 专业编码
+     * @return 生产专业管理
+     */
+    public DcBaseWorkSpecial selectDcBaseWorkSpecialBySpecialCode(String specialCode);
+
     /**
      * 查询生产专业管理列表
      * 

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

@@ -38,10 +38,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="specialName != null  and specialName != ''"> and special_name like concat('%', #{specialName}, '%')</if>
         </where>
     </select>
+
     <select id="selectDcBaseWorkSpecialById" parameterType="Long" resultMap="DcBaseWorkSpecialResult">
         <include refid="selectDcBaseWorkSpecialVo"/>
         where id = #{id}
     </select>
+
+    <select id="selectDcBaseWorkSpecialBySpecialCode" parameterType="String" resultMap="DcBaseWorkSpecialResult">
+        <include refid="selectDcBaseWorkSpecialVo"/>
+        where special_code = #{specialCode}
+    </select>
         
     <insert id="insertDcBaseWorkSpecial" parameterType="DcBaseWorkSpecial" useGeneratedKeys="true" keyProperty="id">
         insert into dc_base_work_special

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

@@ -1,59 +1,92 @@
 <?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.DcBusiTargetAdjustDayMasterMapper">
+<mapper namespace="com.lzbi.mapper.DcBusiTargetAdjustDayMasterMapper">
-    
+
-    <resultMap type="com.lzbi.draft.domain.DcBusiTargetAdjustDayMasterDao" id="DcBusiTargetAdjustDayMasterResult">
+    <resultMap type="com.lzbi.domain.DcBusiTargetAdjustDayMasterDao" id="DcBusiTargetAdjustDayMasterResult">
-        <result property="billSerial"    column="bill_serial"    />
+        <result property="billSerial" column="bill_serial"/>
-        <result property="biilType"    column="biil_type"    />
+        <result property="biilType" column="biil_type"/>
-        <result property="companyId"    column="company_id"    />
+        <result property="companyId" column="company_id"/>
-        <result property="companyName"    column="company_name"    />
+        <result property="companyName" column="company_name"/>
-        <result property="organizeName"    column="organize_name"    />
+        <result property="organizeName" column="organize_name"/>
-        <result property="oragnizeId"    column="oragnize_id"    />
+        <result property="oragnizeId" column="oragnize_id"/>
-        <result property="assetCode"    column="asset_code"    />
+        <result property="assetCode" column="asset_code"/>
-        <result property="assetName"    column="asset_name"    />
+        <result property="assetName" column="asset_name"/>
-        <result property="id"    column="id"    />
+        <result property="fieldCode" column="field_code"/>
-        <result property="dateAdjust"    column="date_adjust"    />
+        <result property="fieldName" column="field_name"/>
-        <result property="tenantId"    column="tenant_id"    />
+        <result property="id" column="id"/>
-        <result property="revision"    column="revision"    />
+        <result property="dateAdjust" column="date_adjust"/>
-        <result property="createdBy"    column="created_by"    />
+        <result property="tenantId" column="tenant_id"/>
-        <result property="createdTime"    column="created_time"    />
+        <result property="revision" column="revision"/>
-        <result property="updatedBy"    column="updated_by"    />
+        <result property="createdBy" column="created_by"/>
-        <result property="updatedTime"    column="updated_time"    />
+        <result property="createdTime" column="created_time"/>
-        <result property="deleteBy"    column="delete_by"    />
+        <result property="updatedBy" column="updated_by"/>
-        <result property="deleteTime"    column="delete_time"    />
+        <result property="updatedTime" column="updated_time"/>
-        <result property="checkStauts"    column="check_stauts"    />
+        <result property="deleteBy" column="delete_by"/>
-        <result property="checkType"    column="check_type"    />
+        <result property="deleteTime" column="delete_time"/>
+        <result property="checkStauts" column="check_stauts"/>
+        <result property="checkType" column="check_type"/>
     </resultMap>
 
     <sql id="selectDcBusiTargetAdjustDayMasterVo">
-        select bill_serial, biil_type, company_id, company_name, organize_name, oragnize_id, asset_code, asset_name, id, date_adjust, tenant_id, revision, created_by, created_time, updated_by, updated_time, delete_by, delete_time, check_stauts, check_type from dc_busi_target_adjust_day_master
+        select bill_serial,
+               biil_type,
+               company_id,
+               company_name,
+               organize_name,
+               oragnize_id,
+               asset_code,
+               asset_name,
+               field_code,
+               field_name,
+               id,
+               date_adjust,
+               tenant_id,
+               revision,
+               created_by,
+               created_time,
+               updated_by,
+               updated_time,
+               delete_by,
+               delete_time,
+               check_stauts,
+               check_type
+        from dc_busi_target_adjust_day_master
     </sql>
 
-    <select id="selectDcBusiTargetAdjustDayMasterDaoList" parameterType="DcBusiTargetAdjustDayMasterDao" resultMap="DcBusiTargetAdjustDayMasterResult">
+    <select id="selectDcBusiTargetAdjustDayMasterList" parameterType="DcBusiTargetAdjustDayMaster"
+            resultMap="DcBusiTargetAdjustDayMasterResult">
         <include refid="selectDcBusiTargetAdjustDayMasterVo"/>
-        <where>  
+        <where>
-            <if test="billSerial != null  and billSerial != ''"> and bill_serial = #{billSerial}</if>
+            <if test="billSerial != null  and billSerial != ''">and bill_serial = #{billSerial}</if>
-            <if test="biilType != null  and biilType != ''"> and biil_type = #{biilType}</if>
+            <if test="biilType != null  and biilType != ''">and biil_type = #{biilType}</if>
-            <if test="companyId != null "> and company_id = #{companyId}</if>
+            <if test="companyId != null ">and company_id = #{companyId}</if>
-            <if test="companyName != null  and companyName != ''"> and company_name like concat('%', #{companyName}, '%')</if>
+            <if test="companyName != null  and companyName != ''">and company_name like concat('%', #{companyName},
-            <if test="organizeName != null  and organizeName != ''"> and organize_name like concat('%', #{organizeName}, '%')</if>
+                '%')
-            <if test="oragnizeId != null "> and oragnize_id = #{oragnizeId}</if>
+            </if>
-            <if test="assetCode != null  and assetCode != ''"> and asset_code = #{assetCode}</if>
+            <if test="organizeName != null  and organizeName != ''">and organize_name like concat('%', #{organizeName},
-            <if test="assetName != null  and assetName != ''"> and asset_name like concat('%', #{assetName}, '%')</if>
+                '%')
-            <if test="dateAdjust != null  and dateAdjust != ''"> and date_adjust = #{dateAdjust}</if>
+            </if>
-            <if test="checkStauts != null  and checkStauts != ''"> and check_stauts = #{checkStauts}</if>
+            <if test="oragnizeId != null ">and oragnize_id = #{oragnizeId}</if>
-            <if test="checkType != null  and checkType != ''"> and check_type = #{checkType}</if>
+            <if test="assetCode != null  and assetCode != ''">and asset_code = #{assetCode}</if>
+            <if test="assetName != null  and assetName != ''">and asset_name like concat('%', #{assetName}, '%')</if>
+            <if test="fieldCode != null  and fieldCode != ''">and field_code = #{fieldCode}</if>
+            <if test="fieldName != null  and fieldName != ''">and field_name like concat('%', #{fieldName}, '%')</if>
+            <if test="dateAdjust != null  and dateAdjust != ''">and date_adjust = #{dateAdjust}</if>
+            <if test="checkStauts != null  and checkStauts != ''">and check_stauts = #{checkStauts}</if>
+            <if test="checkType != null  and checkType != ''">and check_type = #{checkType}</if>
         </where>
     </select>
-    
+
-    <select id="selectDcBusiTargetAdjustDayMasterDaoById" parameterType="Long" resultMap="DcBusiTargetAdjustDayMasterResult">
+    <select id="selectDcBusiTargetAdjustDayMasterById" parameterType="Long"
+            resultMap="DcBusiTargetAdjustDayMasterResult">
         <include refid="selectDcBusiTargetAdjustDayMasterVo"/>
         where id = #{id}
     </select>
-        
+
-    <insert id="insertDcBusiTargetAdjustDayMasterDao" parameterType="DcBusiTargetAdjustDayMasterDao" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertDcBusiTargetAdjustDayMaster" parameterType="DcBusiTargetAdjustDayMaster" useGeneratedKeys="true"
+            keyProperty="id">
         insert into dc_busi_target_adjust_day_master
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="billSerial != null">bill_serial,</if>
@@ -64,6 +97,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="oragnizeId != null">oragnize_id,</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="dateAdjust != null">date_adjust,</if>
             <if test="tenantId != null">tenant_id,</if>
             <if test="revision != null">revision,</if>
@@ -75,7 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deleteTime != null">delete_time,</if>
             <if test="checkStauts != null">check_stauts,</if>
             <if test="checkType != null">check_type,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="billSerial != null">#{billSerial},</if>
             <if test="biilType != null">#{biilType},</if>
@@ -85,6 +120,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="oragnizeId != null">#{oragnizeId},</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="dateAdjust != null">#{dateAdjust},</if>
             <if test="tenantId != null">#{tenantId},</if>
             <if test="revision != null">#{revision},</if>
@@ -96,10 +133,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deleteTime != null">#{deleteTime},</if>
             <if test="checkStauts != null">#{checkStauts},</if>
             <if test="checkType != null">#{checkType},</if>
-         </trim>
+        </trim>
     </insert>
 
-    <update id="updateDcBusiTargetAdjustDayMasterDao" parameterType="DcBusiTargetAdjustDayMasterDao">
+    <update id="updateDcBusiTargetAdjustDayMaster" parameterType="DcBusiTargetAdjustDayMaster">
         update dc_busi_target_adjust_day_master
         <trim prefix="SET" suffixOverrides=",">
             <if test="billSerial != null">bill_serial = #{billSerial},</if>
@@ -110,6 +147,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="oragnizeId != null">oragnize_id = #{oragnizeId},</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="dateAdjust != null">date_adjust = #{dateAdjust},</if>
             <if test="tenantId != null">tenant_id = #{tenantId},</if>
             <if test="revision != null">revision = #{revision},</if>
@@ -125,12 +164,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
-    <delete id="deleteDcBusiTargetAdjustDayMasterDaoById" parameterType="Long">
+    <delete id="deleteDcBusiTargetAdjustDayMasterById" parameterType="Long">
-        delete from dc_busi_target_adjust_day_master where id = #{id}
+        delete
+        from dc_busi_target_adjust_day_master
+        where id = #{id}
     </delete>
 
-    <delete id="deleteDcBusiTargetAdjustDayMasterDaoByIds" parameterType="String">
+    <delete id="deleteDcBusiTargetAdjustDayMasterByIds" parameterType="String">
-        delete from dc_busi_target_adjust_day_master where id in 
+        delete from dc_busi_target_adjust_day_master where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>