Merge remote-tracking branch 'origin/develop' into develop

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;
 
 }

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<DcBaseAssetInfoMapper, DcBaseAssetInfo> implements IService<DcBaseAssetInfo>
 {
 
+    @Autowired
+    private DcBaseAssetInfoMapper dcBaseAssetInfoMapper;
     /**
      * 查询资产信息
      * 
@@ -27,7 +31,7 @@ public class DcBaseAssetInfoService extends ServiceImpl<DcBaseAssetInfoMapper, D
      */
     public DcBaseAssetInfo selectDcBaseAssetInfoById(Long id)
     {
-        return baseMapper.selectDcBaseAssetInfoById(id);
+        return dcBaseAssetInfoMapper.selectDcBaseAssetInfoById(id);
     }
 
     /**
@@ -38,7 +42,7 @@ public class DcBaseAssetInfoService extends ServiceImpl<DcBaseAssetInfoMapper, D
      */
     public List<DcBaseAssetInfo> selectDcBaseAssetInfoList(DcBaseAssetInfo dcBaseAssetInfo)
     {
-        return baseMapper.selectDcBaseAssetInfoList(dcBaseAssetInfo);
+        return dcBaseAssetInfoMapper.selectDcBaseAssetInfoList(dcBaseAssetInfo);
     }
 
     /**
@@ -51,7 +55,7 @@ public class DcBaseAssetInfoService extends ServiceImpl<DcBaseAssetInfoMapper, D
     public int insertDcBaseAssetInfo(DcBaseAssetInfo dcBaseAssetInfo)
     {
         dcBaseAssetInfo.setCreatedTime(DateUtils.getNowDate());
-        return baseMapper.insertDcBaseAssetInfo(dcBaseAssetInfo);
+        return dcBaseAssetInfoMapper.insertDcBaseAssetInfo(dcBaseAssetInfo);
     }
 
     /**
@@ -64,7 +68,7 @@ public class DcBaseAssetInfoService extends ServiceImpl<DcBaseAssetInfoMapper, D
     public int updateDcBaseAssetInfo(DcBaseAssetInfo dcBaseAssetInfo)
     {
         dcBaseAssetInfo.setUpdatedTime(DateUtils.getNowDate());
-        return baseMapper.updateDcBaseAssetInfo(dcBaseAssetInfo);
+        return dcBaseAssetInfoMapper.updateDcBaseAssetInfo(dcBaseAssetInfo);
     }
 
     /**
@@ -76,7 +80,7 @@ public class DcBaseAssetInfoService extends ServiceImpl<DcBaseAssetInfoMapper, D
 
     public int deleteDcBaseAssetInfoByIds(Long[] ids)
     {
-        return baseMapper.deleteDcBaseAssetInfoByIds(ids);
+        return dcBaseAssetInfoMapper.deleteDcBaseAssetInfoByIds(ids);
     }
 
     /**
@@ -88,12 +92,16 @@ public class DcBaseAssetInfoService extends ServiceImpl<DcBaseAssetInfoMapper, D
 
     public int deleteDcBaseAssetInfoById(Long id)
     {
-        return baseMapper.deleteDcBaseAssetInfoById(id);
+        return dcBaseAssetInfoMapper.deleteDcBaseAssetInfoById(id);
     }
 
 
     public DcBaseAssetInfo selectDcBaseAssetInfoByCode(String  assetCode) {
-        return baseMapper.selectDcBaseAssetInfoByCode(assetCode);
+        return dcBaseAssetInfoMapper.selectDcBaseAssetInfoByCode(assetCode);
+    }
+
+    public HashMap<String,String> selectDcBaseAssetInfoMap(){
+        return dcBaseAssetInfoMapper.selectDcBaseAssetInfoMap();
     }
 
 

lzbi-module/src/main/java/com/lzbi/asset/service/IDcBaseAssetInfoService.java

@@ -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<String,String> selectDcBaseAssetInfoMap();
-    /**
-     * 查询资产信息列表
-     *
-     * @param dcBaseAssetInfo 资产信息
-     * @return 资产信息集合
-     */
-    public List<DcBaseAssetInfo> 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);
-}

lzbi-module/src/main/java/com/lzbi/asset/service/impl/DcBaseAssetInfoServiceImpl.java

@@ -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<String,String> selectDcBaseAssetInfoMap(){
-        return dcBaseAssetInfoMapper.selectDcBaseAssetInfoMap();
-    }
-    /**
-     * 查询资产信息列表
-     *
-     * @param dcBaseAssetInfo 资产信息
-     * @return 资产信息
-     */
-    @Override
-    public List<DcBaseAssetInfo> 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);
-    }
-}

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;

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

@@ -38,6 +38,7 @@ public interface DcBaseCoderuleDefineMapper extends BaseMapper<DcBaseCoderuleDef
      * @return 结果
      */
     public int insertDcBaseCoderuleDefineDao(DcBaseCoderuleDefineDao dcBaseCoderuleDefineDao);
+    public int insertSerial(Long ruleId);
 
     /**
      * 修改编码规则定义

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

@@ -59,6 +59,9 @@ public class CodeNoGenerater {
     }
     private String getSerial(long rid){
         DcBaseCoderuleSerialDao serialByRuleId = dcBaseCoderuleDefineService.getSerialByRuleId(rid);
+        if(StringUtils.isNull(serialByRuleId)){
+            return null;
+        }
         if(dcBaseCoderuleDefineService.updateSerial(serialByRuleId.getRevision(),serialByRuleId.getSerialId()+1,serialByRuleId.getId())>0){
             return String.valueOf(serialByRuleId.getSerialId()+1);
         }else{

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

@@ -57,7 +57,12 @@ public class DcBaseCoderuleDefineService extends ServiceImpl<DcBaseCoderuleDefin
     public int insertDcBaseCoderuleDefineDao(DcBaseCoderuleDefineDao dcBaseCoderuleDefineDao)
     {
         dcBaseCoderuleDefineDao.setCreatedTime(DateUtils.getNowDate());
-        return baseMapper.insertDcBaseCoderuleDefineDao(dcBaseCoderuleDefineDao);
+        int ret=baseMapper.insertDcBaseCoderuleDefineDao(dcBaseCoderuleDefineDao);
+        DcBaseCoderuleDefineDao insert = baseMapper.selectDcBaseCoderuleDefineDaoList(dcBaseCoderuleDefineDao).get(0);
+        if(StringUtils.isNotNull(insert)){
+            baseMapper.insertSerial(insert.getId());
+        }
+        return ret;
     }
 
     /**

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

@@ -10,6 +10,7 @@ import com.lzbi.code.service.DcBaseCoderuleDefineService;
 import com.lzbi.common.annotation.Log;
 import com.lzbi.common.core.controller.BaseController;
 import com.lzbi.common.core.domain.AjaxResult;
+import com.lzbi.common.core.domain.entity.SysDept;
 import com.lzbi.common.core.domain.model.LoginUser;
 import com.lzbi.common.core.page.TableDataInfo;
 import com.lzbi.common.enums.BusinessType;
@@ -22,6 +23,7 @@ import com.lzbi.draft.domain.DcBusiParamBillMaster;
 import com.lzbi.draft.domain.DcBusiParamBillSub;
 import com.lzbi.draft.service.DcBusiBillModelMasterService;
 import com.lzbi.draft.service.DcBusiParamBillMasterService;
+import com.lzbi.system.service.ISysDeptService;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
@@ -53,6 +55,8 @@ public class DcBusiParamCollectBill extends BaseController
     private DcBaseCoderuleDefineService dcBaseCoderuleDefineService;
     @Autowired
     private CodeNoGenerater codeNoGenerater;
+    @Autowired
+    private ISysDeptService sysDeptService;
     /**
      * 查询参数采集（录入）
      * 根据
@@ -87,6 +91,13 @@ public class DcBusiParamCollectBill extends BaseController
         List<DcBusiBillModelMaster> 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());
+        long deptId=dcBusiParamBillMaster.getCompanyId();
-        dcBusiBillModelMaster.setCompanyName(dcBusiParamBillMaster.getCompanyName());
+        SysDept sysDept = Optional.ofNullable(sysDeptService.selectDeptById(deptId)).orElse(new SysDept()) ;
-        dcBusiBillModelMaster.setOrgId(dcBusiParamBillMaster.getOragnizeId());
+        dcBusiBillModelMaster.setCompanyId(deptId);
-        dcBusiBillModelMaster.setOrgName(dcBusiBillModelMaster.getOrgName());
+        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<DcBusiBillModelSub> dcBusiBillModelSubList=new ArrayList<>();
-        List<DcBusiParamBillSub> dcBusiParamBillSubList = dcBusiParamBillMaster.getDcBusiParamBillSubList();
+        JSONArray jsonArray=Optional.ofNullable(JSONArray.from(dcBusiParamBillMaster.getSubDatas())).orElse(new JSONArray());
-        dcBusiParamBillSubList.forEach(item -> {
+        jsonArray.forEach(item -> {
+            JSONObject jsb = JSONObject.from(item);
             DcBusiBillModelSub modelSub=new DcBusiBillModelSub();
             modelSub.setBillModelNo(billModelNo);
-            modelSub.setAssetCode(item.getAssetCode());
+            modelSub.setAssetCode(jsb.getString("assetCode"));
-            modelSub.setAssetName(item.getAssetName());
+            modelSub.setAssetName(jsb.getString("assetName"));
             //modelSub.setAssetId(item.get);
-            modelSub.setAssetUnitCode(item.getParamCode());
+            modelSub.setAssetUnitCode(jsb.getString("paramCode"));
-            modelSub.setAssetUnitName(item.getParamName());
+            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);
     }

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;
+
+
 }

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 = "")

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;

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

@@ -53,7 +53,7 @@ public interface DcBusiBillModelMasterMapper extends BaseMapper<DcBusiBillModelM
      * @return 结果
      */
     public int deleteDcBusiBillModelMasterById(Long id);
-
+    public int deleteDcBusiBillModelMasterByNo(String billNo);
     /**
      * 批量删除录入配置
      * 
@@ -85,5 +85,5 @@ public interface DcBusiBillModelMasterMapper extends BaseMapper<DcBusiBillModelM
      * @param id 录入配置ID
      * @return 结果
      */
-    public int deleteDcBusiBillModelSubByBillModelNo(Long id);
+    public int deleteDcBusiBillModelSubByBillModelNo(String id);
 }

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

@@ -71,7 +71,7 @@ public class DcBusiBillModelMasterService extends ServiceImpl<DcBusiBillModelMas
     public int updateDcBusiBillModelMaster(DcBusiBillModelMaster dcBusiBillModelMaster)
     {
         dcBusiBillModelMaster.setUpdatedTime(DateUtils.getNowDate());
-        baseMapper.deleteDcBusiBillModelSubByBillModelNo(dcBusiBillModelMaster.getId());
+        baseMapper.deleteDcBusiBillModelSubByBillModelNo(dcBusiBillModelMaster.getBillModelNo());
         insertDcBusiBillModelSub(dcBusiBillModelMaster);
         return baseMapper.updateDcBusiBillModelMaster(dcBusiBillModelMaster);
     }
@@ -98,10 +98,11 @@ public class DcBusiBillModelMasterService extends ServiceImpl<DcBusiBillModelMas
      */
     @Transactional
 
-    public int deleteDcBusiBillModelMasterById(Long id)
+    public int deleteDcBusiBillModelMasterById(String id)
     {
+
         baseMapper.deleteDcBusiBillModelSubByBillModelNo(id);
-        return baseMapper.deleteDcBusiBillModelMasterById(id);
+        return baseMapper.deleteDcBusiBillModelMasterByNo(id);
     }
 
     /**

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

@@ -129,6 +129,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="codeSplitFlag != null">#{codeSplitFlag},</if>
          </trim>
     </insert>
+    <insert id="insertSerial" parameterType="long" useGeneratedKeys="true" keyProperty="id">
+       insert into dc_base_coderule_serial(code_rule_id,serial_id,revision) values (#{param1},0,0)
+    </insert>
 
     <update id="updateDcBaseCoderuleDefineDao" parameterType="DcBaseCoderuleDefineDao">
         update dc_base_coderule_define

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

@@ -42,6 +42,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="assetUnitType"    column="sub_asset_unit_type"    />
         <result property="id"    column="sub_id"    />
         <result property="assetId"    column="sub_asset_id"    />
+        <result property="assetUnitAlialsName"    column="sub_asset_unit_alials_name"    />
+        <result property="aUnit"    column="sub_a_unit"    />
+
     </resultMap>
 
     <sql id="selectDcBusiBillModelMasterVo">
@@ -69,9 +72,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <select id="selectDcBusiBillModelMasterById" parameterType="Long" resultMap="DcBusiBillModelMasterDcBusiBillModelSubResult">
         select a.tenant_id, a.revision, a.created_by, a.created_time, a.updated_by, a.updated_time, a.delete_by, a.delete_time, a.dept_id, a.role_id, a.bill_model_no, a.bill_model_name, a.field_code, a.company_name, a.company_id, a.bill_model_point, a.org_name, a.org_id, a.id, a.data_state, a.use_state, a.field_name,
- b.bill_model_no as sub_bill_model_no, b.asset_code as sub_asset_code, b.asset_name as sub_asset_name, b.asset_unit_code as sub_asset_unit_code, b.asset_unit_name as sub_asset_unit_name, b.asset_unit_type as sub_asset_unit_type, b.id as sub_id, b.asset_id as sub_asset_id
+ b.bill_model_no as sub_bill_model_no, b.asset_code as sub_asset_code, b.asset_name as sub_asset_name, b.asset_unit_code as sub_asset_unit_code, b.asset_unit_name as sub_asset_unit_name, b.asset_unit_type as sub_asset_unit_type, b.id as sub_id, b.asset_id as sub_asset_id,asset_unit_alials_name as sub_asset_unit_alials_name,a_unit as sub_a_unit
         from dc_busi_bill_model_master a
-        left join dc_busi_bill_model_sub b on b.bill_model_no = a.id
+        left join dc_busi_bill_model_sub b on b.bill_model_no = a.bill_model_no
         where a.id = #{id}
     </select>
         
@@ -156,7 +159,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <delete id="deleteDcBusiBillModelMasterById" parameterType="Long">
         delete from dc_busi_bill_model_master where id = #{id}
     </delete>
-
+    <delete id="deleteDcBusiBillModelMasterByNo" parameterType="String">
+        delete from dc_busi_bill_model_master where bill_model_no = #{billNo}
+    </delete>
     <delete id="deleteDcBusiBillModelMasterByIds" parameterType="String">
         delete from dc_busi_bill_model_master where id in 
         <foreach item="id" collection="array" open="(" separator="," close=")">
@@ -171,14 +176,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </delete>
 
-    <delete id="deleteDcBusiBillModelSubByBillModelNo" parameterType="Long">
+    <delete id="deleteDcBusiBillModelSubByBillModelNo" parameterType="String">
         delete from dc_busi_bill_model_sub where bill_model_no = #{billModelNo}
     </delete>
 
     <insert id="batchDcBusiBillModelSub">
-        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
 		<foreach item="item" index="index" collection="list" separator=",">
-            ( #{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})
         </foreach>
     </insert>
 </mapper>