diff --git a/lzbi-module/src/main/java/com/lzbi/asset/domain/DcBusiWorkReadConfig.java b/lzbi-module/src/main/java/com/lzbi/asset/domain/DcBusiWorkReadConfig.java index b117dc7..53275b4 100644 --- a/lzbi-module/src/main/java/com/lzbi/asset/domain/DcBusiWorkReadConfig.java +++ b/lzbi-module/src/main/java/com/lzbi/asset/domain/DcBusiWorkReadConfig.java @@ -2,6 +2,7 @@ package com.lzbi.asset.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import com.lzbi.common.annotation.Excel; import com.lzbi.module.base.BaseModuleEntity; @@ -19,67 +20,72 @@ public class DcBusiWorkReadConfig extends BaseModuleEntity { private static final long serialVersionUID = 1L; /** 主键 */ - @Excel(name = "主键") @TableId(type= IdType.AUTO) private Long id; - + @ApiModelProperty(name = "公司ID", notes = "") /** 公司ID */ private Long companyId; /** 公司名称 */ - @Excel(name = "公司名称") + @ApiModelProperty(name = "公司名称", notes = "") private String companyName; /** 组织机构名称 */ - @Excel(name = "组织机构名称") + @ApiModelProperty(name = "组织机构名称", notes = "") private String organizeName; /** 组织机构ID */ + @ApiModelProperty(name = "组织机构ID", notes = "") private Long oragnizeId; /** 统计单元编码 */ + @ApiModelProperty(name = "统计单元编码", notes = "") private String assetCode; /** 统计单元名称 */ - @Excel(name = "统计单元名称") + @ApiModelProperty(name = "统计单元名称", notes = "") private String assetName; /** 统计参数编码 */ + @ApiModelProperty(name = "统计参数编码", notes = "") private String assetParamCode; /** 目标参数编码 */ + @ApiModelProperty(name = "目标参数编码", notes = "") private String goalParamCode; /** 目标参数名称 */ - @Excel(name = "目标参数名称") + @ApiModelProperty(name = "目标参数名称", notes = "") private String goalParamName; /** 目标参数扩展1 */ - @Excel(name = "目标参数扩展1") + @ApiModelProperty(name = "目标参数扩展1", notes = "") private String goalParamExt1; /** 目标参数扩展2 */ - @Excel(name = "目标参数扩展2") + @ApiModelProperty(name = "目标参数扩展2", notes = "") private String goalParamExt2; /** 读取数值类型 */ - @Excel(name = "读取数值类型") + @ApiModelProperty(name = "读取数值类型", notes = "") private String goalParamType; /** 数据来源 */ - @Excel(name = "数据来源") + @ApiModelProperty(name = "数据来源", notes = "") private String goalSource; /** 生产专业编码 */ + @ApiModelProperty(name = "生产专业编码", notes = "") private String assetFieldCode; /** 生产专业名称 */ - @Excel(name = "生产专业名称") + @ApiModelProperty(name = "生产专业名称", notes = "") private String assetFieldName; /** 统计单元参数名称 */ - @Excel(name = "统计单元参数名称") + @ApiModelProperty(name = "统计单元参数名称", notes = "") private String assetParamName; + @ApiModelProperty(name = "目标参数名称", notes = "") private Integer paramCounts; } diff --git a/lzbi-module/src/main/java/com/lzbi/asset/service/DcBaseAssetInfoService.java b/lzbi-module/src/main/java/com/lzbi/asset/service/DcBaseAssetInfoService.java index 3bee66d..4393146 100644 --- a/lzbi-module/src/main/java/com/lzbi/asset/service/DcBaseAssetInfoService.java +++ b/lzbi-module/src/main/java/com/lzbi/asset/service/DcBaseAssetInfoService.java @@ -5,8 +5,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.lzbi.asset.domain.DcBaseAssetInfo; import com.lzbi.asset.mapper.DcBaseAssetInfoMapper; import com.lzbi.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.HashMap; import java.util.List; /** @@ -19,6 +21,8 @@ import java.util.List; public class DcBaseAssetInfoService extends ServiceImpl implements IService { + @Autowired + private DcBaseAssetInfoMapper dcBaseAssetInfoMapper; /** * 查询资产信息 * @@ -27,7 +31,7 @@ public class DcBaseAssetInfoService extends ServiceImpl selectDcBaseAssetInfoList(DcBaseAssetInfo dcBaseAssetInfo) { - return baseMapper.selectDcBaseAssetInfoList(dcBaseAssetInfo); + return dcBaseAssetInfoMapper.selectDcBaseAssetInfoList(dcBaseAssetInfo); } /** @@ -51,7 +55,7 @@ public class DcBaseAssetInfoService extends ServiceImpl selectDcBaseAssetInfoMap(){ + return dcBaseAssetInfoMapper.selectDcBaseAssetInfoMap(); } diff --git a/lzbi-module/src/main/java/com/lzbi/asset/service/IDcBaseAssetInfoService.java b/lzbi-module/src/main/java/com/lzbi/asset/service/IDcBaseAssetInfoService.java deleted file mode 100644 index 0bc18a8..0000000 --- a/lzbi-module/src/main/java/com/lzbi/asset/service/IDcBaseAssetInfoService.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.lzbi.asset.service; - - -import com.lzbi.asset.domain.DcBaseAssetInfo; - -import java.util.HashMap; -import java.util.List; - -/** - * 资产信息Service接口 - * - * @author Lu.JL - * @date 2023-11-27 - */ -public interface IDcBaseAssetInfoService { - /** - * 查询资产信息 - * - * @param id 资产信息主键 - * @return 资产信息 - */ - public DcBaseAssetInfo selectDcBaseAssetInfoById(Long id); - public DcBaseAssetInfo selectDcBaseAssetInfoByCode(String assetCode); - //add by zhousq 2023-12-12 获取资产信息Map映射便于存储查询 - public HashMap selectDcBaseAssetInfoMap(); - /** - * 查询资产信息列表 - * - * @param dcBaseAssetInfo 资产信息 - * @return 资产信息集合 - */ - public List selectDcBaseAssetInfoList(DcBaseAssetInfo dcBaseAssetInfo); - - /** - * 新增资产信息 - * - * @param dcBaseAssetInfo 资产信息 - * @return 结果 - */ - public int insertDcBaseAssetInfo(DcBaseAssetInfo dcBaseAssetInfo); - - /** - * 修改资产信息 - * - * @param dcBaseAssetInfo 资产信息 - * @return 结果 - */ - public int updateDcBaseAssetInfo(DcBaseAssetInfo dcBaseAssetInfo); - - /** - * 批量删除资产信息 - * - * @param ids 需要删除的资产信息主键集合 - * @return 结果 - */ - public int deleteDcBaseAssetInfoByIds(Long[] ids); - - /** - * 删除资产信息信息 - * - * @param id 资产信息主键 - * @return 结果 - */ - public int deleteDcBaseAssetInfoById(Long id); -} diff --git a/lzbi-module/src/main/java/com/lzbi/asset/service/impl/DcBaseAssetInfoServiceImpl.java b/lzbi-module/src/main/java/com/lzbi/asset/service/impl/DcBaseAssetInfoServiceImpl.java deleted file mode 100644 index 03827ad..0000000 --- a/lzbi-module/src/main/java/com/lzbi/asset/service/impl/DcBaseAssetInfoServiceImpl.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.lzbi.asset.service.impl; - -import java.util.HashMap; -import java.util.List; - -import com.lzbi.asset.domain.DcBaseAssetInfo; -import com.lzbi.asset.mapper.DcBaseAssetInfoMapper; -import com.lzbi.asset.service.IDcBaseAssetInfoService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -/** - * 资产信息Service业务层处理 - * - * @author Lu.JL - * @date 2023-11-27 - */ -@Service -public class DcBaseAssetInfoServiceImpl implements IDcBaseAssetInfoService { - @Autowired - private DcBaseAssetInfoMapper dcBaseAssetInfoMapper; - - /** - * 查询资产信息 - * - * @param id 资产信息主键 - * @return 资产信息 - */ - @Override - public DcBaseAssetInfo selectDcBaseAssetInfoById(Long id) { - return dcBaseAssetInfoMapper.selectDcBaseAssetInfoById(id); - } - @Override - public DcBaseAssetInfo selectDcBaseAssetInfoByCode(String assetCode) { - return dcBaseAssetInfoMapper.selectDcBaseAssetInfoByCode(assetCode); - } - @Override - public HashMap selectDcBaseAssetInfoMap(){ - return dcBaseAssetInfoMapper.selectDcBaseAssetInfoMap(); - } - /** - * 查询资产信息列表 - * - * @param dcBaseAssetInfo 资产信息 - * @return 资产信息 - */ - @Override - public List selectDcBaseAssetInfoList(DcBaseAssetInfo dcBaseAssetInfo) { - return dcBaseAssetInfoMapper.selectDcBaseAssetInfoList(dcBaseAssetInfo); - } - - /** - * 新增资产信息 - * - * @param dcBaseAssetInfo 资产信息 - * @return 结果 - */ - @Override - public int insertDcBaseAssetInfo(DcBaseAssetInfo dcBaseAssetInfo) { - return dcBaseAssetInfoMapper.insertDcBaseAssetInfo(dcBaseAssetInfo); - } - - /** - * 修改资产信息 - * - * @param dcBaseAssetInfo 资产信息 - * @return 结果 - */ - @Override - public int updateDcBaseAssetInfo(DcBaseAssetInfo dcBaseAssetInfo) { - return dcBaseAssetInfoMapper.updateDcBaseAssetInfo(dcBaseAssetInfo); - } - - /** - * 批量删除资产信息 - * - * @param ids 需要删除的资产信息主键 - * @return 结果 - */ - @Override - public int deleteDcBaseAssetInfoByIds(Long[] ids) { - return dcBaseAssetInfoMapper.deleteDcBaseAssetInfoByIds(ids); - } - - /** - * 删除资产信息信息 - * - * @param id 资产信息主键 - * @return 结果 - */ - @Override - public int deleteDcBaseAssetInfoById(Long id) { - return dcBaseAssetInfoMapper.deleteDcBaseAssetInfoById(id); - } -} diff --git a/lzbi-module/src/main/java/com/lzbi/bill/domain/DcBusiPlanTargetMonth.java b/lzbi-module/src/main/java/com/lzbi/bill/domain/DcBusiPlanTargetMonth.java index 636eada..0950e96 100644 --- a/lzbi-module/src/main/java/com/lzbi/bill/domain/DcBusiPlanTargetMonth.java +++ b/lzbi-module/src/main/java/com/lzbi/bill/domain/DcBusiPlanTargetMonth.java @@ -22,21 +22,6 @@ public class DcBusiPlanTargetMonth 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 companyName; diff --git a/lzbi-module/src/main/java/com/lzbi/code/mapper/DcBaseCoderuleDefineMapper.java b/lzbi-module/src/main/java/com/lzbi/code/mapper/DcBaseCoderuleDefineMapper.java index fb64720..b68f9c2 100644 --- a/lzbi-module/src/main/java/com/lzbi/code/mapper/DcBaseCoderuleDefineMapper.java +++ b/lzbi-module/src/main/java/com/lzbi/code/mapper/DcBaseCoderuleDefineMapper.java @@ -38,6 +38,7 @@ public interface DcBaseCoderuleDefineMapper extends BaseMapper0){ return String.valueOf(serialByRuleId.getSerialId()+1); }else{ diff --git a/lzbi-module/src/main/java/com/lzbi/code/service/DcBaseCoderuleDefineService.java b/lzbi-module/src/main/java/com/lzbi/code/service/DcBaseCoderuleDefineService.java index d78d7af..1eb7531 100644 --- a/lzbi-module/src/main/java/com/lzbi/code/service/DcBaseCoderuleDefineService.java +++ b/lzbi-module/src/main/java/com/lzbi/code/service/DcBaseCoderuleDefineService.java @@ -57,7 +57,12 @@ public class DcBaseCoderuleDefineService extends ServiceImpl list = dcBusiBillModelMasterService.selectDcBusiBillModelMasterList(dcBusiBillModelMaster); return getDataTable(list); } + @GetMapping("/userModelById/{mid}") + public AjaxResult getUserModelById(@PathVariable Long mid) + { + DcBusiBillModelMaster dcBusiBillModelMaster = dcBusiBillModelMasterService.selectDcBusiBillModelMasterById(mid); + return AjaxResult.success(dcBusiBillModelMaster); + } + /** * 根据根据公司查询模版，现根据角色ID进行过滤 * 根据 @@ -130,27 +141,33 @@ public class DcBusiParamCollectBill extends BaseController dcBusiBillModelMaster.setBillModelPoint(dcBusiParamBillMaster.getCountTimes()); dcBusiBillModelMaster.setRoleId(loginUser.getUser().getRoleId()); dcBusiBillModelMaster.setDeptId(loginUser.getDeptId()); - dcBusiBillModelMaster.setCompanyId(dcBusiParamBillMaster.getCompanyId()); - dcBusiBillModelMaster.setCompanyName(dcBusiParamBillMaster.getCompanyName()); - dcBusiBillModelMaster.setOrgId(dcBusiParamBillMaster.getOragnizeId()); - dcBusiBillModelMaster.setOrgName(dcBusiBillModelMaster.getOrgName()); + long deptId=dcBusiParamBillMaster.getCompanyId(); + SysDept sysDept = Optional.ofNullable(sysDeptService.selectDeptById(deptId)).orElse(new SysDept()) ; + dcBusiBillModelMaster.setCompanyId(deptId); + dcBusiBillModelMaster.setCompanyName(sysDept.getDeptName()); + deptId=dcBusiParamBillMaster.getOragnizeId(); + dcBusiBillModelMaster.setOrgId(deptId); + sysDept = Optional.ofNullable(sysDeptService.selectDeptById(deptId)).orElse(new SysDept()) ; + dcBusiBillModelMaster.setOrgName(sysDept.getDeptName()); dcBusiBillModelMaster.setDataState("0"); dcBusiBillModelMaster.setUseState("1"); dcBusiBillModelMaster.setFieldCode(dcBusiParamBillMaster.getFieldCode()); dcBusiBillModelMaster.setFieldName(dcBusiParamBillMaster.getFieldName()); dcBusiBillModelMaster.setBillModelNo(billModelNo); - dcBusiBillModelMaster.setBillModelName(dcBusiParamBillMaster.getBillName()); + dcBusiBillModelMaster.setBillModelName(dcBusiParamBillMaster.getBiilModelName()); List dcBusiBillModelSubList=new ArrayList<>(); - List dcBusiParamBillSubList = dcBusiParamBillMaster.getDcBusiParamBillSubList(); - dcBusiParamBillSubList.forEach(item -> { + JSONArray jsonArray=Optional.ofNullable(JSONArray.from(dcBusiParamBillMaster.getSubDatas())).orElse(new JSONArray()); + jsonArray.forEach(item -> { + JSONObject jsb = JSONObject.from(item); DcBusiBillModelSub modelSub=new DcBusiBillModelSub(); modelSub.setBillModelNo(billModelNo); - modelSub.setAssetCode(item.getAssetCode()); - modelSub.setAssetName(item.getAssetName()); + modelSub.setAssetCode(jsb.getString("assetCode")); + modelSub.setAssetName(jsb.getString("assetName")); //modelSub.setAssetId(item.get); - modelSub.setAssetUnitCode(item.getParamCode()); - modelSub.setAssetUnitName(item.getParamName()); + modelSub.setAssetUnitCode(jsb.getString("paramCode")); + modelSub.setAssetUnitName(jsb.getString("paramName")); modelSub.setAssetUnitType("P"); + modelSub.setAUnit(jsb.getString("paramUint")); dcBusiBillModelSubList.add(modelSub); }); dcBusiBillModelMaster.setDcBusiBillModelSubList(dcBusiBillModelSubList); @@ -211,7 +228,8 @@ public class DcBusiParamCollectBill extends BaseController return AjaxResult.success(dcBusiParamBillMasterService.insertDcBusiParamBillMasterDao(dcBusiParamBillMaster)); } private String getBillModelNo(){ - DcBusiCoderuleConfigDao ruleIdByBusicode = dcBaseCoderuleDefineService.getRuleIdByBusicode("BILL_MODEL_NO"); + DcBusiCoderuleConfigDao ruleIdByBusicode =Optional.ofNullable(dcBaseCoderuleDefineService.getRuleIdByBusicode("BILL_MODEL_NO")).orElse(new DcBusiCoderuleConfigDao()) ; + DcBaseCoderuleDefineDao ruleDao = dcBaseCoderuleDefineService.selectDcBaseCoderuleDefineDaoById(ruleIdByBusicode.getRuleId()); return codeNoGenerater.getCode(ruleDao); } diff --git a/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiBillModelMaster.java b/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiBillModelMaster.java index cac6eb6..c47cf8e 100644 --- a/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiBillModelMaster.java +++ b/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiBillModelMaster.java @@ -21,7 +21,7 @@ import com.lzbi.module.base.BaseModuleEntity; * @date 2023-12-11 */ @Data -@Accessors(chain = true) +@Accessors(chain=true) public class DcBusiBillModelMaster extends BaseModuleEntity { /** 主键 */ diff --git a/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiBillModelSub.java b/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiBillModelSub.java index 7ed18e8..61f7417 100644 --- a/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiBillModelSub.java +++ b/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiBillModelSub.java @@ -1,5 +1,6 @@ package com.lzbi.draft.domain; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; import org.apache.commons.lang3.builder.ToStringBuilder; @@ -13,7 +14,6 @@ import com.lzbi.module.base.BaseModuleEntity; * @author zhousq * @date 2023-12-11 */ - @Data @Accessors(chain = true) public class DcBusiBillModelSub extends BaseModuleEntity @@ -21,33 +21,38 @@ public class DcBusiBillModelSub extends BaseModuleEntity private static final long serialVersionUID = 1L; /** 模版编码号 */ - @Excel(name = "模版编码号") + @ApiModelProperty(name = "模版编码号", notes = "") private String billModelNo; /** 统计单元编码 */ - @Excel(name = "统计单元编码") + @ApiModelProperty(name = "统计单元编码", notes = "") private String assetCode; /** 统计单元名称 */ - @Excel(name = "统计单元名称") + @ApiModelProperty(name = "统计单元名称", notes = "") private String assetName; /** 指标【参数】编码 */ - @Excel(name = "指标【参数】编码") + @ApiModelProperty(name = "指标【参数】编码", notes = "") private String assetUnitCode; /** 指标【参数】名称 */ - @Excel(name = "指标【参数】名称") + @ApiModelProperty(name = "指标【参数】名称", notes = "") private String assetUnitName; + @ApiModelProperty(name = "指标【参数】别名", notes = "") + private String assetUnitAlialsName; /** 数据类别;T指标P参数 */ - @Excel(name = "数据类别;T指标P参数") + @ApiModelProperty(name = "数据类别;T指标P参数", notes = "") private String assetUnitType; - /** 主键 */ - private Long id; +// /** 主键 */ +// private Long id; /** 统计单元ID */ - @Excel(name = "统计单元ID") + @ApiModelProperty(name = "统计单元ID", notes = "") private Long assetId; + private String aUnit; + + } diff --git a/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiParamBillMaster.java b/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiParamBillMaster.java index 83a9cae..e4910f3 100644 --- a/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiParamBillMaster.java +++ b/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiParamBillMaster.java @@ -67,7 +67,9 @@ public class DcBusiParamBillMaster extends BaseModuleEntity // @ApiModelProperty(name = "统计单元名称",notes = "") // private String assetName ; @ApiModelProperty(name = "单据名称",notes = "") - private String billName ; + private String biilModelName ; + @ApiModelProperty(name = "模版编码",notes = "") + private String billModelNo ; @ApiModelProperty(name = "统计日期",notes = "") private String countDate ; @ApiModelProperty(name = "统计整点数",notes = "") diff --git a/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiParamDraftDay.java b/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiParamDraftDay.java index ea7b110..e2f2404 100644 --- a/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiParamDraftDay.java +++ b/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiParamDraftDay.java @@ -19,21 +19,6 @@ public class DcBusiParamDraftDay extends BaseModuleEntity { private static final long serialVersionUID = 1L; - /** 创建人 */ - private String createdBy; - - /** 创建时间 */ - private Date createdTime; - - /** 更新人 */ - private String updatedBy; - - /** 更新时间 */ - private Date updatedTime; - - /** 主键 */ - @Excel(name = "主键") - private Long id; /** 公司编码 */ private Integer companyId; diff --git a/lzbi-module/src/main/java/com/lzbi/draft/mapper/DcBusiBillModelMasterMapper.java b/lzbi-module/src/main/java/com/lzbi/draft/mapper/DcBusiBillModelMasterMapper.java index 068ca3e..ed0432d 100644 --- a/lzbi-module/src/main/java/com/lzbi/draft/mapper/DcBusiBillModelMasterMapper.java +++ b/lzbi-module/src/main/java/com/lzbi/draft/mapper/DcBusiBillModelMasterMapper.java @@ -53,7 +53,7 @@ public interface DcBusiBillModelMasterMapper extends BaseMapper#{codeSplitFlag}, + + insert into dc_base_coderule_serial(code_rule_id,serial_id,revision) values (#{param1},0,0) + update dc_base_coderule_define diff --git a/lzbi-module/src/main/resources/mapper/draft/DcBusiBillModelMasterMapper.xml b/lzbi-module/src/main/resources/mapper/draft/DcBusiBillModelMasterMapper.xml index 60b2cbf..ff3b664 100644 --- a/lzbi-module/src/main/resources/mapper/draft/DcBusiBillModelMasterMapper.xml +++ b/lzbi-module/src/main/resources/mapper/draft/DcBusiBillModelMasterMapper.xml @@ -42,6 +42,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + @@ -69,9 +72,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -156,7 +159,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" delete from dc_busi_bill_model_master where id = #{id} - + + delete from dc_busi_bill_model_master where bill_model_no = #{billNo} + delete from dc_busi_bill_model_master where id in @@ -171,14 +176,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + delete from dc_busi_bill_model_sub where bill_model_no = #{billModelNo} - insert into dc_busi_bill_model_sub( bill_model_no, asset_code, asset_name, asset_unit_code, asset_unit_name, asset_unit_type, id, asset_id) values + insert into dc_busi_bill_model_sub( bill_model_no, asset_code, asset_name, asset_unit_code, asset_unit_name, asset_unit_type, id, asset_id,a_unit,asset_unit_alials_name) values - ( #{item.billModelNo}, #{item.assetCode}, #{item.assetName}, #{item.assetUnitCode}, #{item.assetUnitName}, #{item.assetUnitType}, #{item.id}, #{item.assetId}) + ( #{item.billModelNo}, #{item.assetCode}, #{item.assetName}, #{item.assetUnitCode}, #{item.assetUnitName}, #{item.assetUnitType}, #{item.id}, #{item.assetId},#{item.aUnit},#{item.assetUnitAlialsName}) \ No newline at end of file