diff --git a/lzbi-module/src/main/java/com/lzbi/asset/domain/DcBaseAssetInfo.java b/lzbi-module/src/main/java/com/lzbi/asset/domain/DcBaseAssetInfo.java index c088144..cd026ad 100644 --- a/lzbi-module/src/main/java/com/lzbi/asset/domain/DcBaseAssetInfo.java +++ b/lzbi-module/src/main/java/com/lzbi/asset/domain/DcBaseAssetInfo.java @@ -63,11 +63,17 @@ public class DcBaseAssetInfo extends BaseModuleEntity { @ApiModelProperty(name = "所属公司",notes = "comanyId") private Long comanyId; + /** 公司名称 */ + private String comanyName; + /** 所属组织结构 */ @Excel(name = "所属组织结构") @ApiModelProperty(name = "所属组织结构",notes = "orgId") private Long orgId; + /** 组织名称 */ + private String orgName; + public String getValue() { return this.assetCode; } diff --git a/lzbi-module/src/main/java/com/lzbi/bill/controller/DcBusiTargetInputMasterController.java b/lzbi-module/src/main/java/com/lzbi/bill/controller/DcBusiTargetInputMasterController.java index 854c93f..933c43c 100644 --- a/lzbi-module/src/main/java/com/lzbi/bill/controller/DcBusiTargetInputMasterController.java +++ b/lzbi-module/src/main/java/com/lzbi/bill/controller/DcBusiTargetInputMasterController.java @@ -86,6 +86,13 @@ public class DcBusiTargetInputMasterController extends BaseController return success(dcBusiTargetInputMasterService.selectDcBusiTargetInputMasterById(id)); } + @PreAuthorize("@ss.hasPermi('bill:DcBusiTargetInputMaster:query')") + @GetMapping(value = "/billNo/{billNo}") + public AjaxResult getInfo(@PathVariable("billNo") String billNo) + { + return success(dcBusiTargetInputMasterService.selectDcBusiTargetInputMasterByBillNo(billNo)); + } + /** * 新增指标录入单 */ @@ -151,4 +158,35 @@ public class DcBusiTargetInputMasterController extends BaseController public AjaxResult confirm(@RequestBody ConfirmReq confirmReq) { return dcBusiTargetInputMasterService.confirm(confirmReq); } + + @ApiOperation("驳回") + @PreAuthorize("@ss.hasPermi('bill:dayPlanBill:check')") + @ApiImplicitParams({ + @ApiImplicitParam(name = "billNo", value = "", dataType = "String", dataTypeClass = String.class), + }) + @PostMapping("/checkBack/{billNo}") + public AjaxResult checkBack(@PathVariable String billNo){ + return AjaxResult.success(dcBusiTargetInputMasterService.checkBack(billNo)); + } + + @ApiOperation("审核") + @PreAuthorize("@ss.hasPermi('bill:dayPlanBill:check')") + @ApiImplicitParams({ + @ApiImplicitParam(name = "billNo", value = "", dataType = "String", dataTypeClass = String.class), + }) + @PostMapping("/checkPass/{billNo}") + public AjaxResult checkPass(@PathVariable String billNo){ + + return AjaxResult.success(dcBusiTargetInputMasterService.checkPass(billNo)); + } + + @ApiOperation("反审核") + @PreAuthorize("@ss.hasPermi('bill:dayPlanBill:check')") + @ApiImplicitParams({ + @ApiImplicitParam(name = "billNo", value = "", dataType = "String", dataTypeClass = String.class), + }) + @PostMapping("/checkRevert/{billNo}") + public AjaxResult checkRevert(@PathVariable String billNo){ + return AjaxResult.success(dcBusiTargetInputMasterService.checkRevert(billNo)); + } } diff --git a/lzbi-module/src/main/java/com/lzbi/bill/domain/DcBusiTargetInputMaster.java b/lzbi-module/src/main/java/com/lzbi/bill/domain/DcBusiTargetInputMaster.java index 2cd8927..e811997 100644 --- a/lzbi-module/src/main/java/com/lzbi/bill/domain/DcBusiTargetInputMaster.java +++ b/lzbi-module/src/main/java/com/lzbi/bill/domain/DcBusiTargetInputMaster.java @@ -1,6 +1,8 @@ package com.lzbi.bill.domain; import java.util.Date; +import java.util.List; + import com.fasterxml.jackson.annotation.JsonFormat; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -12,9 +14,9 @@ import com.lzbi.module.base.BaseModuleEntity; /** * 指标录入单对象 dc_busi_target_input_master - * + * * @author lienbo - * @date 2024-01-19 + * @date 2024-01-22 */ @Data @Accessors(chain = true) @@ -22,59 +24,14 @@ public class DcBusiTargetInputMaster extends BaseModuleEntity { private static final long serialVersionUID = 1L; + /** 主键 */ + private Long id; + /** 单据号 */ @Excel(name = "单据号") @ApiModelProperty(name = "单据号",notes = "billSerial") private String billSerial; - /** 单据类别 */ - @Excel(name = "单据类别") - @ApiModelProperty(name = "单据类别",notes = "biilType") - private String biilType; - - /** 公司ID */ - @Excel(name = "公司ID") - @ApiModelProperty(name = "公司ID",notes = "companyId") - private Long companyId; - - /** 公司名称 */ - @Excel(name = "公司名称") - @ApiModelProperty(name = "公司名称",notes = "companyName") - private String companyName; - - /** 组织机构名称 */ - @Excel(name = "组织机构名称") - @ApiModelProperty(name = "组织机构名称",notes = "organizeName") - private String organizeName; - - /** 组织机构ID */ - @Excel(name = "组织机构ID") - @ApiModelProperty(name = "组织机构ID",notes = "oragnizeId") - private Long oragnizeId; - - /** 统计单元编码 */ - @Excel(name = "统计单元编码") - @ApiModelProperty(name = "统计单元编码",notes = "assetCode") - private String assetCode; - - /** 统计单元名称 */ - @Excel(name = "统计单元名称") - @ApiModelProperty(name = "统计单元名称",notes = "assetName") - private String assetName; - - /** 统计专业代码 */ - @Excel(name = "统计专业代码") - @ApiModelProperty(name = "统计专业代码",notes = "fieldCode") - private String fieldCode; - - /** 统计专业名称 */ - @Excel(name = "统计专业名称") - @ApiModelProperty(name = "统计专业名称",notes = "fieldName") - private String fieldName; - - /** 主键 */ - private Long id; - /** 年 */ @Excel(name = "年") @ApiModelProperty(name = "年",notes = "year") @@ -107,4 +64,9 @@ public class DcBusiTargetInputMaster extends BaseModuleEntity @ApiModelProperty(name = "审核类型;1人工2自动",notes = "checkType") private String checkType; + /** + * 子表 + */ + private List subList; + } diff --git a/lzbi-module/src/main/java/com/lzbi/bill/domain/DcBusiTargetInputSub.java b/lzbi-module/src/main/java/com/lzbi/bill/domain/DcBusiTargetInputSub.java index 6b4c5c3..8cd0e11 100644 --- a/lzbi-module/src/main/java/com/lzbi/bill/domain/DcBusiTargetInputSub.java +++ b/lzbi-module/src/main/java/com/lzbi/bill/domain/DcBusiTargetInputSub.java @@ -98,6 +98,11 @@ public class DcBusiTargetInputSub extends BaseModuleEntity @ApiModelProperty(name = "统计单元名称",notes = "assetName") private String assetName; + /** 统计单元别名 */ + @Excel(name = "统计单元别名") + @ApiModelProperty(name = "统计单元别名",notes = "assetNameAlias") + private String assetNameAlias; + /** 统计专业代码 */ @Excel(name = "统计专业代码") @ApiModelProperty(name = "统计专业代码",notes = "fieldCode") diff --git a/lzbi-module/src/main/java/com/lzbi/bill/mapper/DcBusiTargetInputMasterMapper.java b/lzbi-module/src/main/java/com/lzbi/bill/mapper/DcBusiTargetInputMasterMapper.java index 2ef614e..da51071 100644 --- a/lzbi-module/src/main/java/com/lzbi/bill/mapper/DcBusiTargetInputMasterMapper.java +++ b/lzbi-module/src/main/java/com/lzbi/bill/mapper/DcBusiTargetInputMasterMapper.java @@ -3,6 +3,7 @@ package com.lzbi.bill.mapper; import java.util.List; import com.lzbi.bill.domain.DcBusiTargetInputMaster; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; /** * 指标录入单Mapper接口 @@ -20,6 +21,13 @@ public interface DcBusiTargetInputMasterMapper extends BaseMapper list); + /** * 修改指标录入单子 * diff --git a/lzbi-module/src/main/java/com/lzbi/bill/service/DcBusiTargetInputMasterService.java b/lzbi-module/src/main/java/com/lzbi/bill/service/DcBusiTargetInputMasterService.java index 6589c19..09cf9be 100644 --- a/lzbi-module/src/main/java/com/lzbi/bill/service/DcBusiTargetInputMasterService.java +++ b/lzbi-module/src/main/java/com/lzbi/bill/service/DcBusiTargetInputMasterService.java @@ -7,11 +7,16 @@ import com.lzbi.asset.mapper.DcBaseAssetInfoMapper; import com.lzbi.bill.domain.DcBusiTargetInputMaster; import com.lzbi.bill.domain.DcBusiTargetInputSub; import com.lzbi.bill.mapper.DcBusiTargetInputMasterMapper; +import com.lzbi.bill.mapper.DcBusiTargetInputSubMapper; import com.lzbi.common.core.domain.AjaxResult; import com.lzbi.common.utils.DateUtils; +import com.lzbi.common.utils.SecurityUtils; +import com.lzbi.draft.domain.DcBusiTargetAdjustDayMasterDao; +import com.lzbi.draft.domain.DcBusiTargetDraftDaynew; import com.lzbi.draft.domain.req.ConfirmReq; import com.lzbi.draft.domain.req.ProductionDailySheetReq; import com.lzbi.draft.domain.vo.ProductionDailySheetVO; +import com.lzbi.draft.mapper.DcBusiTargetDraftDaynewMapper; import com.lzbi.targetFolder.domain.DcBaseAssetTarget; import com.lzbi.targetFolder.mapper.DcBaseAssetTargetMapper; import org.apache.commons.collections4.IteratorUtils; @@ -23,6 +28,7 @@ import org.apache.poi.xssf.usermodel.XSSFSheet; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; import org.springframework.web.multipart.MultipartFile; @@ -35,6 +41,9 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.concurrent.locks.Lock; +import java.util.concurrent.locks.ReentrantLock; +import java.util.regex.Pattern; import java.util.stream.Collectors; /** @@ -53,6 +62,14 @@ public class DcBusiTargetInputMasterService extends ServiceImpl subList = dcBusiTargetInputSubMapper.selectDcBusiTargetInputSubList(params); + master.setSubList(subList); + return master; + } + /** * 查询指标录入单列表 * @@ -81,10 +108,14 @@ public class DcBusiTargetInputMasterService extends ServiceImpl dcBaseAssetTargetMap = targetMap.get(name); List> data = productionDailySheetReq.getData(); if (!CollectionUtils.isEmpty(data)) { - Map dayMap = new HashMap<>(); + Map dayMap = new HashMap<>(); boolean sign = false; for (int i = 0, leni = data.size(); i < leni; i++) { List row = data.get(i); if ("日期".equals(row.get(0))) { - Map columnMap = new HashMap<>(); int lenj = row.size(); for (int j = 1; j < lenj; j++) { - if (!columnMap.containsKey(row.get(j))) { - columnMap.put(row.get(j), j); + String column = row.get(j); + if ("合计".equals(column)) { + break; } - } - for (int j = 1; j <= 31 && j < lenj; j++) { - String key = j + "日"; - if (columnMap.containsKey(key) && !dayMap.containsKey(key)) { - dayMap.put(j, columnMap.get(key)); + if (Pattern.matches("\\d+[日]+", column)) { + String day = column.substring(0, column.length() - 1); + if (Integer.parseInt(day) > confirmReq.getDays()) { + continue; + } + if (dayMap.containsKey(day)) { + break; + } + dayMap.put(day, j); } } sign = true; @@ -232,16 +267,22 @@ public class DcBusiTargetInputMasterService extends ServiceImpl dcBusiTargetInputSubList = dcBusiTargetInputSubMapper.selectDcBusiTargetInputSubList(subParams); + List newList = new ArrayList<>(); + if (!CollectionUtils.isEmpty(dcBusiTargetInputSubList)) { + String year = master.getYear(); + String month = master.getMonth(); + List targetCodeList = dcBusiTargetInputSubList.stream().map(DcBusiTargetInputSub::getTargetCode).collect(Collectors.toList()); + List dcBaseAssetTargets = dcBaseAssetTargetMapper.selectDcBaseAssetTargetByTargetCodeList(targetCodeList); + Map targetModelCodeMap = dcBaseAssetTargets.stream().collect(Collectors.toMap(DcBaseAssetTarget::getTargetCode, DcBaseAssetTarget::getTargetModelCode)); + for (DcBusiTargetInputSub dcBusiTargetInputSub : dcBusiTargetInputSubList) { + String day = dcBusiTargetInputSub.getDay(); + DcBusiTargetDraftDaynew dcBusiTargetDraftDaynew = new DcBusiTargetDraftDaynew(); + dcBusiTargetDraftDaynew.setCompanyId(dcBusiTargetInputSub.getCompanyId()); + dcBusiTargetDraftDaynew.setOrganizeId(dcBusiTargetInputSub.getOragnizeId()); + dcBusiTargetDraftDaynew.setAssetCode(dcBusiTargetInputSub.getAssetCode()); + dcBusiTargetDraftDaynew.setFieldCode(dcBusiTargetInputSub.getFieldCode()); + dcBusiTargetDraftDaynew.setTargetCode(dcBusiTargetInputSub.getTargetCode()); + dcBusiTargetDraftDaynew.setDateYear(year); + dcBusiTargetDraftDaynew.setDateMonth(month); + dcBusiTargetDraftDaynew.setDateDay(day); + List dcBusiTargetDraftDaynewList = dcBusiTargetDraftDaynewMapper.selectDcBusiTargetDraftDaynewList(dcBusiTargetDraftDaynew); + if (CollectionUtils.isEmpty(dcBusiTargetDraftDaynewList)) { + dcBusiTargetDraftDaynew.setCompanyName(dcBusiTargetInputSub.getCompanyName()); + dcBusiTargetDraftDaynew.setOrganizeName(dcBusiTargetInputSub.getOrganizeName()); + dcBusiTargetDraftDaynew.setAssetName(dcBusiTargetInputSub.getAssetName()); + dcBusiTargetDraftDaynew.setFieldName(dcBusiTargetInputSub.getFieldName()); + dcBusiTargetDraftDaynew.setTagetName(dcBusiTargetInputSub.getTargetName()); + dcBusiTargetDraftDaynew.setValueResult(dcBusiTargetInputSub.getValResult()); + dcBusiTargetDraftDaynew.setTargetModelCode(targetModelCodeMap.get(dcBusiTargetInputSub.getTargetCode())); + newList.add(dcBusiTargetDraftDaynew); + } else { + String msg = "{} 中 {} {}-{}-{}，已存在"; + throw new RuntimeException(String.format(msg, dcBusiTargetInputSub.getAssetNameAlias(), dcBusiTargetInputSub.getTargetName(), year, month, StringUtils.leftPad(day, 2, "0"))); + } + } + dcBusiTargetDraftDaynewMapper.batchInsertDcBusiTargetDraftDaynew(newList); + } + // 修改审核状态为已处理 + master.setCheckStatus("2"); + master.setUpdatedBy(SecurityUtils.getUsername()); + master.setCreatedTime(DateUtils.getNowDate()); + return baseMapper.updateDcBusiTargetInputMaster(master); + } catch (RuntimeException e) { + log.error("处理异常", e); + throw e; + } finally { + lock.unlock(); + } + } + + public int checkRevert(String billNo) { + lock.lock(); + try { + DcBusiTargetInputMaster master = baseMapper.selectDcBusiTargetInputMasterByBillSerial(billNo); + if ("0".equals(master.getCheckStatus())) { + throw new RuntimeException("反审核失败，单据未提交"); + } + if ("1".equals(master.getCheckStatus())) { + throw new RuntimeException("反审核失败，单据未审核通过"); + } + DcBusiTargetInputSub subParams = new DcBusiTargetInputSub(); + subParams.setBillNoMaster(billNo); + List dcBusiTargetInputSubList = dcBusiTargetInputSubMapper.selectDcBusiTargetInputSubList(subParams); + List newList = new ArrayList<>(); + if (!CollectionUtils.isEmpty(dcBusiTargetInputSubList)) { + String year = master.getYear(); + String month = master.getMonth(); + for (DcBusiTargetInputSub dcBusiTargetInputSub : dcBusiTargetInputSubList) { + String day = dcBusiTargetInputSub.getDay(); + DcBusiTargetDraftDaynew dcBusiTargetDraftDaynew = new DcBusiTargetDraftDaynew(); + dcBusiTargetDraftDaynew.setCompanyId(dcBusiTargetInputSub.getCompanyId()); + dcBusiTargetDraftDaynew.setOrganizeId(dcBusiTargetInputSub.getOragnizeId()); + dcBusiTargetDraftDaynew.setAssetCode(dcBusiTargetInputSub.getAssetCode()); + dcBusiTargetDraftDaynew.setFieldCode(dcBusiTargetInputSub.getFieldCode()); + dcBusiTargetDraftDaynew.setTargetCode(dcBusiTargetInputSub.getTargetCode()); + dcBusiTargetDraftDaynew.setDateYear(year); + dcBusiTargetDraftDaynew.setDateMonth(month); + dcBusiTargetDraftDaynew.setDateDay(day); + List dcBusiTargetDraftDaynewList = dcBusiTargetDraftDaynewMapper.selectDcBusiTargetDraftDaynewList(dcBusiTargetDraftDaynew); + if (!CollectionUtils.isEmpty(dcBusiTargetDraftDaynewList)) { + newList.addAll(dcBusiTargetDraftDaynewList); + } + } + if (!CollectionUtils.isEmpty(newList)) { + List idList = newList.stream().map(DcBusiTargetDraftDaynew::getId).collect(Collectors.toList()); + Long[] ids = idList.toArray(new Long[]{}); + dcBusiTargetDraftDaynewMapper.deleteDcBusiTargetDraftDaynewByIds(ids); + } + } + // 修改审核状态为已处理 + master.setCheckStatus("1"); + master.setUpdatedBy(SecurityUtils.getUsername()); + master.setCreatedTime(DateUtils.getNowDate()); + return baseMapper.updateDcBusiTargetInputMaster(master); + } catch (RuntimeException e) { + log.error("处理异常", e); + throw e; + } finally { + lock.unlock(); + } + } + } diff --git a/lzbi-module/src/main/java/com/lzbi/draft/controller/DcBusiTargetDraftDaynewController.java b/lzbi-module/src/main/java/com/lzbi/draft/controller/DcBusiTargetDraftDaynewController.java index 6cde257..1d8a81b 100644 --- a/lzbi-module/src/main/java/com/lzbi/draft/controller/DcBusiTargetDraftDaynewController.java +++ b/lzbi-module/src/main/java/com/lzbi/draft/controller/DcBusiTargetDraftDaynewController.java @@ -124,7 +124,7 @@ public class DcBusiTargetDraftDaynewController extends BaseController @PreAuthorize("@ss.hasPermi('bi:dcBusiTargetDraftDaynew:remove')") @Log(title = "指标数据底稿日-新结构", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable String[] ids) + public AjaxResult remove(@PathVariable Long[] ids) { return toAjax(dcBusiTargetDraftDaynewService.deleteDcBusiTargetDraftDaynewByIds(ids)); } diff --git a/lzbi-module/src/main/java/com/lzbi/draft/domain/req/ConfirmReq.java b/lzbi-module/src/main/java/com/lzbi/draft/domain/req/ConfirmReq.java index 48e9dcf..8151737 100644 --- a/lzbi-module/src/main/java/com/lzbi/draft/domain/req/ConfirmReq.java +++ b/lzbi-module/src/main/java/com/lzbi/draft/domain/req/ConfirmReq.java @@ -7,5 +7,16 @@ import java.util.List; @Data public class ConfirmReq { + /** + * sheet页数据 + */ private List list; + /** + * 单据号 + */ + private String billNo; + /** + * 天数 + */ + private int days; } diff --git a/lzbi-module/src/main/java/com/lzbi/draft/mapper/DcBusiTargetDraftDaynewMapper.java b/lzbi-module/src/main/java/com/lzbi/draft/mapper/DcBusiTargetDraftDaynewMapper.java index 981821f..913b69f 100644 --- a/lzbi-module/src/main/java/com/lzbi/draft/mapper/DcBusiTargetDraftDaynewMapper.java +++ b/lzbi-module/src/main/java/com/lzbi/draft/mapper/DcBusiTargetDraftDaynewMapper.java @@ -3,6 +3,7 @@ package com.lzbi.draft.mapper; import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.lzbi.draft.domain.DcBusiTargetDraftDaynew; +import org.apache.ibatis.annotations.Param; /** * 指标数据底稿日-新结构Mapper接口 @@ -37,6 +38,8 @@ public interface DcBusiTargetDraftDaynewMapper extends BaseMapper list); + /** * 修改指标数据底稿日-新结构 * @@ -59,5 +62,5 @@ public interface DcBusiTargetDraftDaynewMapper extends BaseMapper */ public List selectDcBaseAssetTargetList(DcBaseAssetTarget dcBaseAssetTarget); + List selectDcBaseAssetTargetByTargetCodeList(@Param("targetCodeList") List targetCodeList); + /** * 新增资产指标配置 @@ -78,6 +80,4 @@ public interface DcBaseAssetTargetMapper extends BaseMapper public List selectDcBaseAssetTargetExpandList(DcBaseAssetTargetExpand dcBaseAssetTargetExpand); - - } diff --git a/lzbi-module/src/main/resources/mapper/asset/DcBaseAssetInfoMapper.xml b/lzbi-module/src/main/resources/mapper/asset/DcBaseAssetInfoMapper.xml index 5d3c800..f6a6688 100644 --- a/lzbi-module/src/main/resources/mapper/asset/DcBaseAssetInfoMapper.xml +++ b/lzbi-module/src/main/resources/mapper/asset/DcBaseAssetInfoMapper.xml @@ -23,6 +23,7 @@ + @@ -45,6 +46,7 @@ flag_validate_user, status_asset, comany_id, + org_id, dept_id from dc_base_asset_info @@ -73,9 +75,22 @@ where id = #{id} - + SELECT + t1.id, + t1.asset_name AS "assetName", + t1.asset_name_alias AS "assetNameAlias", + t1.asset_code AS "assetCode", + t1.comany_id AS "comanyId", + t2.dept_name AS "comanyName", + t1.org_id AS "orgId", + t3.dept_name AS "orgName" + FROM + dc_base_asset_info t1 + LEFT JOIN sys_dept t2 ON t1.comany_id = t2.dept_id + LEFT JOIN sys_dept t3 ON t1.org_id = t3.dept_id + where t1.asset_name_alias = #{assetNameAlias} - + and bill_serial = #{billSerial} - and biil_type = #{biilType} - and company_id = #{companyId} - and company_name like concat('%', #{companyName}, '%') - and organize_name like concat('%', #{organizeName}, '%') - and oragnize_id = #{oragnizeId} - and asset_code = #{assetCode} - and asset_name like concat('%', #{assetName}, '%') - and field_code = #{fieldCode} - and field_name like concat('%', #{fieldName}, '%') and year = #{year} and month = #{month} and check_status = #{checkStatus} and check_type = #{checkType} - + - + + insert into dc_busi_target_input_master bill_serial, - biil_type, - company_id, - company_name, - organize_name, - oragnize_id, - asset_code, - asset_name, - field_code, - field_name, year, month, tenant_id, @@ -84,18 +62,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" delete_time, check_status, check_type, - + #{billSerial}, - #{biilType}, - #{companyId}, - #{companyName}, - #{organizeName}, - #{oragnizeId}, - #{assetCode}, - #{assetName}, - #{fieldCode}, - #{fieldName}, #{year}, #{month}, #{tenantId}, @@ -108,22 +77,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{deleteTime}, #{checkStatus}, #{checkType}, - + update dc_busi_target_input_master bill_serial = #{billSerial}, - biil_type = #{biilType}, - company_id = #{companyId}, - company_name = #{companyName}, - organize_name = #{organizeName}, - oragnize_id = #{oragnizeId}, - asset_code = #{assetCode}, - asset_name = #{assetName}, - field_code = #{fieldCode}, - field_name = #{fieldName}, year = #{year}, month = #{month}, tenant_id = #{tenantId}, @@ -145,7 +105,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from dc_busi_target_input_master where id in + delete from dc_busi_target_input_master where id in #{id} diff --git a/lzbi-module/src/main/resources/mapper/draft/DcBusiTargetInputSubMapper.xml b/lzbi-module/src/main/resources/mapper/draft/DcBusiTargetInputSubMapper.xml index ab281d3..746b5ac 100644 --- a/lzbi-module/src/main/resources/mapper/draft/DcBusiTargetInputSubMapper.xml +++ b/lzbi-module/src/main/resources/mapper/draft/DcBusiTargetInputSubMapper.xml @@ -26,12 +26,13 @@ + - select tenant_id, revision, created_by, created_time, updated_by, updated_time, delete_by, delete_time, id, bill_no_master, target_code, target_name, taget_unit, day, val_result, company_id, company_name, organize_name, oragnize_id, asset_code, asset_name, field_code, field_name from dc_busi_target_input_sub + select tenant_id, revision, created_by, created_time, updated_by, updated_time, delete_by, delete_time, id, bill_no_master, target_code, target_name, taget_unit, day, val_result, company_id, company_name, organize_name, oragnize_id, asset_code, asset_name, asset_name_alias, field_code, field_name from dc_busi_target_input_sub + +