diff --git a/lzbi-generator/src/main/resources/vm/java/domain.java.vm b/lzbi-generator/src/main/resources/vm/java/domain.java.vm
index 919565d..41c781e 100644
--- a/lzbi-generator/src/main/resources/vm/java/domain.java.vm
+++ b/lzbi-generator/src/main/resources/vm/java/domain.java.vm
@@ -6,6 +6,8 @@ import ${import};
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import lombok.Data;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.experimental.Accessors;
import com.lzbi.common.annotation.Excel;
#if($table.crud || $table.sub)
import com.lzbi.module.base.BaseModuleEntity;
@@ -25,6 +27,7 @@ import com.lzbi.common.core.domain.TreeEntity;
#set($Entity="TreeEntity")
#end
@Data
+@Accessors(chain = true)
public class ${ClassName} extends ${Entity}
{
private static final long serialVersionUID = 1L;
@@ -41,11 +44,14 @@ public class ${ClassName} extends ${Entity}
#end
#if($parentheseIndex != -1)
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ @ApiModelProperty(name = "${comment}",notes = "")
#elseif($column.javaType == 'Date')
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd")
+ @ApiModelProperty(name = "${comment}",notes = "")
#else
@Excel(name = "${comment}")
+ @ApiModelProperty(name = "${comment}",notes = "$column.javaField")
#end
#end
private $column.javaType $column.javaField;
diff --git a/lzbi-generator/src/main/resources/vm/java/service.java.vm b/lzbi-generator/src/main/resources/vm/java/service.java.vm
index 7245529..92c5edb 100644
--- a/lzbi-generator/src/main/resources/vm/java/service.java.vm
+++ b/lzbi-generator/src/main/resources/vm/java/service.java.vm
@@ -11,6 +11,7 @@ import org.springframework.stereotype.Service;
#if($table.sub)
import java.util.ArrayList;
import com.lzbi.common.utils.DateUtils;
+import com.lzbi.common.utils.StringUtils
import org.springframework.transaction.annotation.Transactional;
import ${packageName}.domain.${subClassName};
#end
@@ -156,7 +157,7 @@ public class ${ClassName}Service extends ServiceImpl<${ClassName}Mapper, ${Class
}
if (list.size() > 0)
{
- baseMapper.batch${subClassName}list);
+ baseMapper.batch${subClassName}(list);
}
}
}
diff --git a/lzbi-generator/src/main/resources/vm/vue/index.vue_ruoyi.vm b/lzbi-generator/src/main/resources/vm/vue/index.vue_ruoyi.vm
new file mode 100644
index 0000000..466424b
--- /dev/null
+++ b/lzbi-generator/src/main/resources/vm/vue/index.vue_ruoyi.vm
@@ -0,0 +1,684 @@
+
+
+
+
+#foreach($column in $columns)
+#if($column.query)
+#set($dictType=$column.dictType)
+#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+#set($parentheseIndex=$column.columnComment.indexOf("("))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+#if($column.htmlType == "input")
+
+
+
+
+
+#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType)
+
+
+
+
+
+
+
+#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && !$dictType)
+
+
+
+
+
+
+
+#elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN")
+
+
+
+
+
+
+#elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+
+
+
+
+
+#end
+#end
+#end
+
+ 搜索
+ 重置
+
+
+
+
+
+
+ 新增
+
+
+ 修改
+
+
+ 删除
+
+
+ 导出
+
+
+
+
+
+
+#foreach($column in $columns)
+#set($javaField=$column.javaField)
+#set($parentheseIndex=$column.columnComment.indexOf("("))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+#if($column.pk)
+
+#elseif($column.list && $column.htmlType == "datetime")
+
+
+ {{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }}
+
+
+#elseif($column.list && $column.htmlType == "imageUpload")
+
+
+
+
+
+#elseif($column.list && "" != $column.dictType)
+
+
+#if($column.htmlType == "checkbox")
+
+#else
+
+#end
+
+
+#elseif($column.list && "" != $javaField)
+
+#end
+#end
+
+
+
+
操作
+
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
+#foreach($column in $columns)
+#set($field=$column.javaField)
+#if($column.insert && !$column.pk)
+#if(($column.usableColumn) || (!$column.superColumn))
+#set($parentheseIndex=$column.columnComment.indexOf("("))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+#set($dictType=$column.dictType)
+#if($column.htmlType == "input")
+
+
+
+
+
+#elseif($column.htmlType == "imageUpload")
+
+
+
+
+
+#elseif($column.htmlType == "fileUpload")
+
+
+
+
+
+#elseif($column.htmlType == "editor")
+
+
+
+
+
+#elseif($column.htmlType == "select" && $dictType)
+
+
+
+
+
+
+
+#elseif($column.htmlType == "select" && !$dictType)
+
+
+
+
+
+
+
+#elseif($column.htmlType == "checkbox" && "" != $dictType)
+
+
+
+
+ {{dict.label}}
+
+
+
+
+#elseif($column.htmlType == "checkbox" && $dictType)
+
+
+
+ 请选择字典生成
+
+
+
+#elseif($column.htmlType == "radio" && "" != $dictType)
+
+
+
+ {{dict.label}}
+
+
+
+#elseif($column.htmlType == "radio" && $dictType)
+
+
+
+ 请选择字典生成
+
+
+
+#elseif($column.htmlType == "datetime")
+
+
+
+
+
+
+#elseif($column.htmlType == "textarea")
+
+
+
+
+
+#end
+#end
+#end
+#end
+#if($table.sub)
+ ${subTable.functionName}信息
+
+
+ 添加
+
+
+ 删除
+
+
+
+
+
+#foreach($column in $subTable.columns)
+#set($javaField=$column.javaField)
+#set($parentheseIndex=$column.columnComment.indexOf("("))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+#if($column.pk || $javaField == ${subTableFkclassName})
+#elseif($column.list && $column.htmlType == "input")
+
+
+
+
+
+#elseif($column.list && $column.htmlType == "datetime")
+
+
+
+
+
+
+#elseif($column.list && ($column.htmlType == "select" || $column.htmlType == "radio") && "" != $column.dictType)
+
+
+
+
+
+
+
+#elseif($column.list && ($column.htmlType == "select" || $column.htmlType == "radio") && "" == $column.dictType)
+
+
+
+
+
+
+
+#end
+#end
+
+#end
+
+
+
+
+
+
+
+
+
+
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 61fb367..8276ae2 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
@@ -13,7 +13,6 @@ import lombok.experimental.Accessors;
* @date 2023-11-27
*/
@Data
-//@TableName("dc_base_work_special")
@Accessors(chain = true)
public class DcBaseAssetInfo extends BaseModuleEntity {
private static final long serialVersionUID = 1L;
diff --git a/lzbi-module/src/main/java/com/lzbi/bill/service/DcBusiPlanTargetMonthService.java b/lzbi-module/src/main/java/com/lzbi/bill/service/DcBusiPlanTargetMonthService.java
index 7b654a6..9fbb2ad 100644
--- a/lzbi-module/src/main/java/com/lzbi/bill/service/DcBusiPlanTargetMonthService.java
+++ b/lzbi-module/src/main/java/com/lzbi/bill/service/DcBusiPlanTargetMonthService.java
@@ -9,7 +9,7 @@ import com.lzbi.common.utils.DateUtils;
import com.lzbi.special.domain.DcBaseWorkSpecial;
import com.lzbi.special.mapper.DcBaseWorkSpecialMapper;
import com.lzbi.system.service.impl.SysDeptServiceImpl;
-import com.lzbi.targetFolder.domain.DcBaseAssetTargetDao;
+import com.lzbi.targetFolder.domain.DcBaseAssetTarget;
import com.lzbi.targetFolder.mapper.DcBaseAssetTargetMapper;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -94,10 +94,10 @@ public class DcBusiPlanTargetMonthService extends ServiceImpl list = dcBusiBillModelMasterService.selectDcBusiBillModelMasterList(dcBusiBillModelMaster);
return getDataTable(list);
}
+ @GetMapping("/userModellist")
+ public TableDataInfo getUserModellist(DeptQueryParams deptQueryParams)
+ { startPage();
+ List list;
+ if(StringUtils.isNotNull(deptQueryParams)){
+ DcBusiBillModelMaster dcBusiBillModelMaster=new DcBusiBillModelMaster();
+ LoginUser loginUser = SecurityUtils.getLoginUser();
+ dcBusiBillModelMaster.setCreatedBy(loginUser.getUsername());
+ dcBusiBillModelMaster.setModelType("P");
+ if(Optional.ofNullable(deptQueryParams.getOrgType()).orElse("").equals("1002")){
+ dcBusiBillModelMaster.setCompanyId(Optional.ofNullable(deptQueryParams.getDeptId()).orElse(0L));
+ }else{
+ dcBusiBillModelMaster.setOrgId(Optional.ofNullable(deptQueryParams.getDeptId()).orElse(0L));
+ }
+ list = dcBusiBillModelMasterService.selectDcBusiBillModelMasterList(dcBusiBillModelMaster);
+ }else{
+ list=new ArrayList<>();
+ }
+
+
+ return getDataTable(list);
+ }
@GetMapping("/userModelById/{mid}")
public AjaxResult getUserModelById(@PathVariable Long mid)
{
@@ -141,6 +161,7 @@ public class DcBusiParamCollectBill extends BaseController
dcBusiBillModelMaster.setBillModelPoint(dcBusiParamBillMaster.getCountTimes());
dcBusiBillModelMaster.setRoleId(loginUser.getUser().getRoleId());
dcBusiBillModelMaster.setDeptId(loginUser.getDeptId());
+ dcBusiBillModelMaster.setModelType("P");
long deptId=dcBusiParamBillMaster.getCompanyId();
SysDept sysDept = Optional.ofNullable(sysDeptService.selectDeptById(deptId)).orElse(new SysDept()) ;
dcBusiBillModelMaster.setCompanyId(deptId);
@@ -180,6 +201,16 @@ public class DcBusiParamCollectBill extends BaseController
@PostMapping("/saveBillCollectObj")
public AjaxResult saveBillCollectByObj(@RequestBody DcBusiParamBillMaster dcBusiParamBillMaster){
dcBusiParamBillMaster.setId(null);
+ dcBusiParamBillMaster.setCreatedBy(SecurityUtils.getLoginUser().getUsername());
+ dcBusiParamBillMaster.setCreatedTime(DateUtil.date());
+ long deptId=dcBusiParamBillMaster.getCompanyId();
+ SysDept sysDept = Optional.ofNullable(sysDeptService.selectDeptById(deptId)).orElse(new SysDept()) ;
+ dcBusiParamBillMaster.setCompanyId(deptId);
+ dcBusiParamBillMaster.setCompanyName(sysDept.getDeptName());
+ deptId=dcBusiParamBillMaster.getOragnizeId();
+ dcBusiParamBillMaster.setOragnizeId(deptId);
+ sysDept = Optional.ofNullable(sysDeptService.selectDeptById(deptId)).orElse(new SysDept()) ;
+ dcBusiParamBillMaster.setOrganizeName(sysDept.getDeptName());
return AjaxResult.success(dcBusiParamBillMasterService.insertDcBusiParamBillMasterDao(dcBusiParamBillMaster));
}
@ApiOperation("保存参数采集数据-subDatas数组方式")
@@ -196,6 +227,15 @@ public class DcBusiParamCollectBill extends BaseController
String countDate=dcBusiParamBillMaster.getCountDate();
dcBusiParamBillMaster.setBillIncomeDate(countDate);
dcBusiParamBillMaster.setCreatedBy(SecurityUtils.getLoginUser().getUsername());
+ dcBusiParamBillMaster.setCreatedTime(DateUtil.date());
+ long deptId=dcBusiParamBillMaster.getCompanyId();
+ SysDept sysDept = Optional.ofNullable(sysDeptService.selectDeptById(deptId)).orElse(new SysDept()) ;
+ dcBusiParamBillMaster.setCompanyId(deptId);
+ dcBusiParamBillMaster.setCompanyName(sysDept.getDeptName());
+ deptId=dcBusiParamBillMaster.getOragnizeId();
+ dcBusiParamBillMaster.setOragnizeId(deptId);
+ sysDept = Optional.ofNullable(sysDeptService.selectDeptById(deptId)).orElse(new SysDept()) ;
+ dcBusiParamBillMaster.setOrganizeName(sysDept.getDeptName());
JSONArray jsonArray=Optional.ofNullable(JSONArray.from(dcBusiParamBillMaster.getSubDatas())).orElse(new JSONArray());
jsonArray.forEach(item->{
JSONObject jsb = JSONObject.from(item);
diff --git a/lzbi-module/src/main/java/com/lzbi/draft/controller/DcBusiTargetBillMasterController.java b/lzbi-module/src/main/java/com/lzbi/draft/controller/DcBusiTargetBillMasterController.java
new file mode 100644
index 0000000..23725a0
--- /dev/null
+++ b/lzbi-module/src/main/java/com/lzbi/draft/controller/DcBusiTargetBillMasterController.java
@@ -0,0 +1,131 @@
+package com.lzbi.draft.controller;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.lzbi.common.annotation.Log;
+import com.lzbi.common.core.controller.BaseController;
+import com.lzbi.common.core.domain.AjaxResult;
+import com.lzbi.common.enums.BusinessType;
+import com.lzbi.draft.domain. DcBusiTargetBillMaster;
+import com.lzbi.draft.service.DcBusiTargetBillMasterService;
+import com.lzbi.common.utils.poi.ExcelUtil;
+import com.lzbi.common.core.page.TableDataInfo;
+
+/**
+ * 统计指标录入Controller
+ *
+ * @author zhousq
+ * @date 2023-12-14
+ */
+@RestController
+@RequestMapping("/draft/targetBillMaster")
+public class DcBusiTargetBillMasterController extends BaseController
+{
+ @Autowired
+ private DcBusiTargetBillMasterService dcBusiTargetBillMasterService;
+
+ /**
+ * 查询统计指标录入列表
+ */
+ @ApiOperation("查询统计指标录入列表")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "DcBusiTargetBillMaster", value = "", dataType = "DcBusiTargetBillMaster", dataTypeClass = DcBusiTargetBillMaster.class),
+ })
+ @PreAuthorize("@ss.hasPermi('draft:targetCollect:list')")
+ @GetMapping("/list")
+ public TableDataInfo list(DcBusiTargetBillMaster DcBusiTargetBillMaster)
+ {
+ startPage();
+ List< DcBusiTargetBillMaster> list = dcBusiTargetBillMasterService.selectDcBusiTargetBillMasterList(DcBusiTargetBillMaster);
+ return getDataTable(list);
+ }
+
+ /**
+ * 导出统计指标录入列表
+ */
+ @ApiOperation("导出统计指标录入列表")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "DcBusiTargetBillMaster", value = "", dataType = "DcBusiTargetBillMaster", dataTypeClass = DcBusiTargetBillMaster.class),
+ })
+ @PreAuthorize("@ss.hasPermi('draft:targetCollect:export')")
+ @Log(title = "统计指标录入", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response,DcBusiTargetBillMaster DcBusiTargetBillMaster)
+ {
+ List list = dcBusiTargetBillMasterService.selectDcBusiTargetBillMasterList(DcBusiTargetBillMaster);
+ ExcelUtil util = new ExcelUtil(DcBusiTargetBillMaster.class);
+ util.exportExcel(response, list, "统计指标录入数据");
+ }
+
+ /**
+ * 获取统计指标录入详细信息
+ */
+ @ApiOperation("获取统计指标录入详细信息")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "id", value = "", dataType = "Long", dataTypeClass = Long.class),
+ })
+ @PreAuthorize("@ss.hasPermi('draft:targetCollect:query')")
+ @GetMapping(value = "/{id}")
+ public AjaxResult getInfo(@PathVariable("id") Long id)
+ {
+ return success(dcBusiTargetBillMasterService.selectDcBusiTargetBillMasterById(id));
+ }
+
+ /**
+ * 新增统计指标录入
+ */
+ @ApiOperation("新增统计指标录入")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "DcBusiTargetBillMaster", value = "", dataType = "DcBusiTargetBillMaster", dataTypeClass = DcBusiTargetBillMaster.class),
+ })
+ @PreAuthorize("@ss.hasPermi('draft:targetCollect:add')")
+ @Log(title = "统计指标录入", businessType = BusinessType.INSERT)
+ @PostMapping
+ public AjaxResult add(@RequestBody DcBusiTargetBillMaster DcBusiTargetBillMaster)
+ {
+ return toAjax(dcBusiTargetBillMasterService.insertDcBusiTargetBillMaster(DcBusiTargetBillMaster));
+ }
+
+ /**
+ * 修改统计指标录入
+ */
+
+ @ApiOperation("修改统计指标录入")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "DcBusiTargetBillMaster", value = "", dataType = "DcBusiTargetBillMaster", dataTypeClass = DcBusiTargetBillMaster.class),
+ })
+ @PreAuthorize("@ss.hasPermi('draft:targetCollect:edit')")
+ @Log(title = "统计指标录入", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody DcBusiTargetBillMaster DcBusiTargetBillMaster)
+ {
+ return toAjax(dcBusiTargetBillMasterService.updateDcBusiTargetBillMaster(DcBusiTargetBillMaster));
+ }
+
+ /**
+ * 删除统计指标录入
+ */
+ @ApiOperation("删除统计指标录入")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "ids", value = "", dataType = "Long", dataTypeClass =Long.class),
+ })
+ @PreAuthorize("@ss.hasPermi('draft:targetCollect:remove')")
+ @Log(title = "统计指标录入", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids)
+ {
+ return toAjax(dcBusiTargetBillMasterService.deleteDcBusiTargetBillMasterByIds(ids));
+ }
+}
diff --git a/lzbi-module/src/main/java/com/lzbi/draft/controller/DcBusiTargetCollectBill.java b/lzbi-module/src/main/java/com/lzbi/draft/controller/DcBusiTargetCollectBill.java
new file mode 100644
index 0000000..2ad3bea
--- /dev/null
+++ b/lzbi-module/src/main/java/com/lzbi/draft/controller/DcBusiTargetCollectBill.java
@@ -0,0 +1,274 @@
+package com.lzbi.draft.controller;
+
+import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
+import com.lzbi.code.domain.DcBaseCoderuleDefineDao;
+import com.lzbi.code.domain.DcBusiCoderuleConfigDao;
+import com.lzbi.code.service.CodeNoGenerater;
+import com.lzbi.code.service.DcBaseCoderuleDefineService;
+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.utils.SecurityUtils;
+import com.lzbi.common.utils.StringUtils;
+import com.lzbi.draft.domain.*;
+import com.lzbi.draft.service.DcBusiBillModelMasterService;
+import com.lzbi.draft.service.DcBusiTargetBillMasterService;
+import com.lzbi.system.service.ISysDeptService;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+/**
+ * 参数采集(录入)单据主Controller
+ *
+ * @author win
+ * @date 2023-11-28
+ */
+@RestController
+@RequestMapping("/draft/targetCollect")
+public class DcBusiTargetCollectBill extends BaseController
+{
+ @Autowired
+ private DcBusiBillModelMasterService dcBusiBillModelMasterService;
+ @Autowired
+ private DcBusiTargetBillMasterService dcBusiTargetBillMasterService;
+
+ @Autowired
+ private DcBaseCoderuleDefineService dcBaseCoderuleDefineService;
+ @Autowired
+ private CodeNoGenerater codeNoGenerater;
+ @Autowired
+ private ISysDeptService sysDeptService;
+ /**
+ * 查询参数采集(录入)
+ * 根据
+ */
+ // @PreAuthorize("@ss.hasPermi('param:paramData:list')")
+ @GetMapping("/list")
+ public TableDataInfo list(DcBusiTargetBillMaster dcBusiTargetBillMasterDao)
+ {
+ startPage();
+ //List list = dcBusiTargetBillMasterService.selectDcBusiTargetBillMasterDaoList(dcBusiTargetBillMasterDao);
+ return getDataTable(null);
+ }
+ /**
+ * 根据根据公司查询模版,现根据用户名进行过滤
+ * 根据
+ */
+ @ApiOperation("根据根据公司查询模版,现根据用户名进行过滤")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "companyId", value = "", dataType = "Long", dataTypeClass = Long.class),
+ })
+ //@PreAuthorize("@ss.hasPermi('param:paramData:list')")
+ @GetMapping("/userModellist/{companyId}")
+ public TableDataInfo getUserModellist(@PathVariable Long companyId)
+ {
+ DcBusiBillModelMaster dcBusiBillModelMaster=new DcBusiBillModelMaster();
+ LoginUser loginUser = SecurityUtils.getLoginUser();
+ dcBusiBillModelMaster.setCreatedBy(loginUser.getUsername());
+ dcBusiBillModelMaster.setCompanyId(Optional.ofNullable(companyId).orElse(null));
+ dcBusiBillModelMaster.setModelType("T");
+ //dcBusiBillModelMaster.setDeptId(loginUser.getDeptId());
+ //dcBusiBillModelMaster.setRoleId(loginUser.getUser().getRoleId());
+ startPage();
+ List list = dcBusiBillModelMasterService.selectDcBusiBillModelMasterList(dcBusiBillModelMaster);
+ return getDataTable(list);
+ }
+ @GetMapping("/userModellist")
+ public TableDataInfo getUserModellist(DeptQueryParams deptQueryParams)
+ { startPage();
+ List list;
+ if(StringUtils.isNotNull(deptQueryParams)){
+ DcBusiBillModelMaster dcBusiBillModelMaster=new DcBusiBillModelMaster();
+ LoginUser loginUser = SecurityUtils.getLoginUser();
+ dcBusiBillModelMaster.setCreatedBy(loginUser.getUsername());
+ dcBusiBillModelMaster.setModelType("T");
+ if(Optional.ofNullable(deptQueryParams.getOrgType()).orElse("").equals("1002")){
+ dcBusiBillModelMaster.setCompanyId(Optional.ofNullable(deptQueryParams.getDeptId()).orElse(0L));
+ }else{
+ dcBusiBillModelMaster.setOrgId(Optional.ofNullable(deptQueryParams.getDeptId()).orElse(0L));
+ }
+ list = dcBusiBillModelMasterService.selectDcBusiBillModelMasterList(dcBusiBillModelMaster);
+ }else{
+ list=new ArrayList<>();
+ }
+
+
+ return getDataTable(list);
+ }
+ @GetMapping("/userModelById/{mid}")
+ public AjaxResult getUserModelById(@PathVariable Long mid)
+ {
+ DcBusiBillModelMaster dcBusiBillModelMaster = dcBusiBillModelMasterService.selectDcBusiBillModelMasterById(mid);
+ return AjaxResult.success(dcBusiBillModelMaster);
+ }
+
+ /**
+ * 根据根据公司查询模版,现根据角色ID进行过滤
+ * 根据
+ */
+ @ApiOperation("根据根据公司查询模版,现根据角色ID进行过滤")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "companyId", value = "", dataType = "Long", dataTypeClass = Long.class),
+ })
+ //@PreAuthorize("@ss.hasPermi('param:paramData:list')")
+ @GetMapping("/roleModellist/{companyId}")
+ public TableDataInfo getRoleModellist(@PathVariable Long companyId)
+ {
+ DcBusiBillModelMaster dcBusiBillModelMaster=new DcBusiBillModelMaster();
+ LoginUser loginUser = SecurityUtils.getLoginUser();
+ dcBusiBillModelMaster.setCompanyId(Optional.ofNullable(companyId).orElse(null));
+ dcBusiBillModelMaster.setRoleId(loginUser.getUser().getRoleId());
+ dcBusiBillModelMaster.setModelType("T");
+ startPage();
+ List list = dcBusiBillModelMasterService.selectDcBusiBillModelMasterList(dcBusiBillModelMaster);
+ return getDataTable(list);
+ }
+ @ApiOperation("根据单据模版编号获取模版内容信息")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "modelNo", value = "", dataType = "String", dataTypeClass = String.class),
+ })
+ @GetMapping("/getBillModelDetail/{modelNo}")
+ public AjaxResult getBillModelDetail(@PathVariable String modelNo){
+ List list=new ArrayList<>();
+ return AjaxResult.success();
+ }
+ @ApiOperation("保存配置模版")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "dcBusiTargetBillMaster", value = "", dataType = "DcBusiParamBillMaster", dataTypeClass = DcBusiTargetBillMaster.class),
+ })
+ @PostMapping("/saveBillModel")
+ public AjaxResult saveBillModel(@RequestBody DcBusiTargetBillMaster dcBusiParamBillMaster){
+ LoginUser loginUser = SecurityUtils.getLoginUser();
+ String billModelNo=Optional.ofNullable(getBillModelNo()).orElse(StringUtils.leftPad(String.valueOf(dcBusiParamBillMaster.getCompanyId()),4)+"#"+DateUtil.formatDateTime(DateUtil.date()));
+ DcBusiBillModelMaster dcBusiBillModelMaster=new DcBusiBillModelMaster();
+ dcBusiBillModelMaster.setCreatedTime(DateUtil.date());
+ dcBusiBillModelMaster.setCreatedBy(loginUser.getUsername());
+ dcBusiBillModelMaster.setBillModelPoint(dcBusiParamBillMaster.getCountTimes());
+ dcBusiBillModelMaster.setRoleId(loginUser.getUser().getRoleId());
+ dcBusiBillModelMaster.setDeptId(loginUser.getDeptId());
+ dcBusiBillModelMaster.setModelType("T");
+ 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.getBiilModelName());
+ List dcBusiBillModelSubList=new ArrayList<>();
+ 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(jsb.getString("assetCode"));
+ modelSub.setAssetName(jsb.getString("assetName"));
+ //modelSub.setAssetId(item.get);
+ modelSub.setAssetUnitCode(jsb.getString("targetCode"));
+ modelSub.setAssetUnitName(jsb.getString("targetName"));
+ modelSub.setAssetUnitType("T");
+ modelSub.setAUnit(jsb.getString("targetUint"));
+ dcBusiBillModelSubList.add(modelSub);
+ });
+ dcBusiBillModelMaster.setDcBusiBillModelSubList(dcBusiBillModelSubList);
+ return AjaxResult.success(dcBusiBillModelMasterService.insertDcBusiBillModelMaster(dcBusiBillModelMaster));
+ }
+ @ApiOperation("保存参数采集数据-直接对象方式")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "dcBusiParamBillMaster", value = "", dataType = "DcBusiParamBillMaster", dataTypeClass = DcBusiTargetBillMaster.class),
+ })
+ @PostMapping("/saveBillCollectObj")
+ public AjaxResult saveBillCollectByObj(@RequestBody DcBusiTargetBillMaster dcBusiTargetBillMaster){
+ dcBusiTargetBillMaster.setId(null);
+ dcBusiTargetBillMaster.setCreatedBy(SecurityUtils.getLoginUser().getUsername());
+ dcBusiTargetBillMaster.setCreatedTime(DateUtil.date());
+ long deptId=dcBusiTargetBillMaster.getCompanyId();
+ SysDept sysDept = Optional.ofNullable(sysDeptService.selectDeptById(deptId)).orElse(new SysDept()) ;
+ dcBusiTargetBillMaster.setCompanyId(deptId);
+ dcBusiTargetBillMaster.setCompanyName(sysDept.getDeptName());
+ deptId=dcBusiTargetBillMaster.getOragnizeId();
+ dcBusiTargetBillMaster.setOragnizeId(deptId);
+ sysDept = Optional.ofNullable(sysDeptService.selectDeptById(deptId)).orElse(new SysDept()) ;
+ dcBusiTargetBillMaster.setOrganizeName(sysDept.getDeptName());
+ return AjaxResult.success(dcBusiTargetBillMasterService.insertDcBusiTargetBillMaster(dcBusiTargetBillMaster));
+ }
+ @ApiOperation("保存参数采集数据-subDatas数组方式")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "dcBusiTargetBillMaster", value = "", dataType = "DcBusiTargetBillMaster", dataTypeClass = DcBusiTargetBillMaster.class),
+ })
+ @PostMapping("/saveBillCollectArray")
+ /*subDatas为动态数据列,值是分开的索要对每个列值进行处理*/
+ public AjaxResult saveBillCollectBy(@RequestBody DcBusiTargetBillMaster dcBusiTargetBillMaster){
+ List dcBusiTargetBillSubList =new ArrayList<>();
+ String billNo=dcBusiTargetBillMaster.getBillNo();
+ String fieldCode=dcBusiTargetBillMaster.getFieldCode();
+ String fieldName=dcBusiTargetBillMaster.getFieldName();
+ String countDate=dcBusiTargetBillMaster.getCountDate();
+ dcBusiTargetBillMaster.setBillIncomeDate(countDate);
+ dcBusiTargetBillMaster.setCreatedBy(SecurityUtils.getLoginUser().getUsername());
+ dcBusiTargetBillMaster.setCreatedTime(DateUtil.date());
+ long deptId=dcBusiTargetBillMaster.getCompanyId();
+ SysDept sysDept = Optional.ofNullable(sysDeptService.selectDeptById(deptId)).orElse(new SysDept()) ;
+ dcBusiTargetBillMaster.setCompanyId(deptId);
+ dcBusiTargetBillMaster.setCompanyName(sysDept.getDeptName());
+ deptId=dcBusiTargetBillMaster.getOragnizeId();
+ dcBusiTargetBillMaster.setOragnizeId(deptId);
+ sysDept = Optional.ofNullable(sysDeptService.selectDeptById(deptId)).orElse(new SysDept()) ;
+ dcBusiTargetBillMaster.setOrganizeName(sysDept.getDeptName());
+ JSONArray jsonArray=Optional.ofNullable(JSONArray.from(dcBusiTargetBillMaster.getSubDatas())).orElse(new JSONArray());
+ jsonArray.forEach(item->{
+ JSONObject jsb = JSONObject.from(item);
+ for(int i=1;i<31;i++){
+ String fname="val_"+String.valueOf(i);
+ Double value=jsb.getDouble(fname);
+ if(StringUtils.isNotNull(value)){
+ DcBusiTargetBillSub dcBusiTargetBillSub=new DcBusiTargetBillSub();
+ //基本数据
+ dcBusiTargetBillSub.setBillNo(billNo);
+ dcBusiTargetBillSub.setId(null);
+ dcBusiTargetBillSub.setTargetCode(jsb.getString("targetCode"));
+ dcBusiTargetBillSub.setAssetCode(jsb.getString("assetCode"));
+ dcBusiTargetBillSub.setAssetName(jsb.getString("assetName"));
+ //dcBusiTargetBillSub.setCountDate(jsb.getString("countDate"));
+ dcBusiTargetBillSub.setCountDate(countDate);
+ dcBusiTargetBillSub.setTargetUint(jsb.getString("targetUint"));
+ dcBusiTargetBillSub.setTargetName(jsb.getString("targetName"));
+ dcBusiTargetBillSub.setFieldCode(fieldCode);
+ dcBusiTargetBillSub.setFieldName(fieldName);
+ dcBusiTargetBillSub.setCountDay(i);
+ dcBusiTargetBillSub.setTargetValue(value);
+ dcBusiTargetBillSubList.add(dcBusiTargetBillSub);
+ }
+ }
+
+
+ });
+ dcBusiTargetBillMaster.setDcBusiTargetBillSubList(dcBusiTargetBillSubList);
+ return AjaxResult.success(dcBusiTargetBillMasterService.insertDcBusiTargetBillMaster(dcBusiTargetBillMaster));
+ }
+ private String getBillModelNo(){
+ 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 c47cf8e..0e32378 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
@@ -1,15 +1,9 @@
package com.lzbi.draft.domain;
import java.util.List;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.experimental.Accessors;
-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;
@@ -25,62 +19,76 @@ import com.lzbi.module.base.BaseModuleEntity;
public class DcBusiBillModelMaster extends BaseModuleEntity
{
/** 主键 */
- @ApiModelProperty(name = "主键",notes = "")
- @TableId(type= IdType.AUTO)
- private Long id ;
+// @ApiModelProperty(name = "主键",notes = "")
+// @TableId(type= IdType.AUTO)
+// private Long id ;
private static final long serialVersionUID = 1L;
/** 部门Id */
- @Excel(name = "部门Id")
- private Long deptId;
+// @Excel(name = "部门Id")
+// @ApiModelProperty(name = "模版类型",notes = "")
+// private Long deptId;
/** 角色ID */
@Excel(name = "角色ID")
+ @ApiModelProperty(name = "角色ID",notes = "")
private Long roleId;
/** 任务模版编号 */
@Excel(name = "任务模版编号")
+ @ApiModelProperty(name = "任务模版编号",notes = "")
private String billModelNo;
/** 任务模版名称 */
@Excel(name = "任务模版名称")
+ @ApiModelProperty(name = "任务模版名称",notes = "")
private String billModelName;
/** 所属专业编码 */
@Excel(name = "所属专业编码")
+ @ApiModelProperty(name = "所属专业编码",notes = "")
private String fieldCode;
/** 所属公司名称 */
@Excel(name = "所属公司名称")
+ @ApiModelProperty(name = "所属公司名称",notes = "")
private String companyName;
/** 所属公司ID */
@Excel(name = "所属公司ID")
+ @ApiModelProperty(name = "所属公司ID",notes = "")
private Long companyId;
/** 任务整点 */
@Excel(name = "任务整点")
+ @ApiModelProperty(name = "任务整点",notes = "")
private String billModelPoint;
/** 所属组织名称 */
@Excel(name = "所属组织名称")
+ @ApiModelProperty(name = "所属组织名称",notes = "")
private String orgName;
/** 所属组织ID */
@Excel(name = "所属组织ID")
+ @ApiModelProperty(name = "所属组织ID",notes = "")
private Long orgId;
/** 数据状态 */
@Excel(name = "数据状态")
+ @ApiModelProperty(name = "数据状态",notes = "")
private String dataState;
/** 使用状态 */
@Excel(name = "使用状态")
+ @ApiModelProperty(name = "使用状态",notes = "")
private String useState;
/** 所属专业名称 */
@Excel(name = "所属专业名称")
+ @ApiModelProperty(name = "所属专业名称",notes = "")
private String fieldName;
-
+ @ApiModelProperty(name = "模版类型",notes = "")
+ private String modelType;
/** 数据录入单模版子信息 */
private List dcBusiBillModelSubList;
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 e4910f3..2c8d9c1 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
@@ -78,6 +78,7 @@ public class DcBusiParamBillMaster extends BaseModuleEntity
private String fieldCode;
@ApiModelProperty(name = "专业名称",notes = "")
private String fieldName;
+
/** 参数数据采集(录入)明细信息 */
private List dcBusiParamBillSubList;
@ApiModelProperty(name = "data数组数据未转换",notes = "")
diff --git a/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiTargetBillMaster.java b/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiTargetBillMaster.java
new file mode 100644
index 0000000..7802322
--- /dev/null
+++ b/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiTargetBillMaster.java
@@ -0,0 +1,100 @@
+package com.lzbi.draft.domain;
+
+import java.util.List;
+import java.util.Date;
+
+import com.alibaba.fastjson2.JSONArray;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import lombok.Data;
+import com.lzbi.common.annotation.Excel;
+import com.lzbi.module.base.BaseModuleEntity;
+
+/**
+ * 统计指标录入对象 dc_busi_target_bill_master
+ *
+ * @author zhousq
+ * @date 2023-12-14
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Accessors(chain = true)
+@ApiModel(value = "指标采集(录入)单据主表",description = "")
+@TableName("dc_busi_target_bill_master")
+public class DcBusiTargetBillMaster extends BaseModuleEntity
+{
+ private static final long serialVersionUID = 1L;
+
+ /** 主键 */
+ private Long id;
+
+ /** 单据编号 */
+ @Excel(name = "单据编号")
+ @ApiModelProperty(name = "单据编号",notes = "")
+ private String billNo;
+
+ /** 采集时间 */
+ @Excel(name = "采集时间")
+ @ApiModelProperty(name = "采集时间",notes = "")
+ private String billIncomeDate;
+
+ /** 单据类型 */
+ @Excel(name = "单据类型")
+ @ApiModelProperty(name = "单据类型",notes = "")
+ private String billType;
+
+ /** 审核类型 */
+ @Excel(name = "审核类型")
+ @ApiModelProperty(name = "审核类型",notes = "")
+ private String checkType;
+
+ /** 审核状态 */
+ @Excel(name = "审核状态")
+ @ApiModelProperty(name = "审核状态",notes = "")
+ private String checkStatus;
+
+ /** 公司ID */
+ @Excel(name = "公司ID")
+ @ApiModelProperty(name = "公司ID",notes = "")
+ private Long companyId;
+
+ /** 公司名称 */
+ @Excel(name = "公司名称")
+ @ApiModelProperty(name = "公司名称",notes = "")
+ private String companyName;
+
+ /** 组织机构名称 */
+ @Excel(name = "组织机构名称")
+ @ApiModelProperty(name = "组织机构名称",notes = "")
+ private String organizeName;
+
+ /** 组织机构ID */
+ @Excel(name = "组织机构ID")
+ @ApiModelProperty(name = "组织机构ID",notes = "")
+ private Long oragnizeId;
+
+ /** 指标数据采集(录入)明细信息 */
+ private List dcBusiTargetBillSubList;
+ @ApiModelProperty(name = "单据模版名称",notes = "")
+ private String biilModelName ;
+ @ApiModelProperty(name = "模版编码",notes = "")
+ private String billModelNo ;
+ @ApiModelProperty(name = "统计月份",notes = "")
+ private String countDate ;
+ @ApiModelProperty(name = "统计日期",notes = "")
+ private String countTimes;
+ @ApiModelProperty(name = "专业编码",notes = "")
+ private String fieldCode;
+ @ApiModelProperty(name = "专业名称",notes = "")
+ private String fieldName;
+ @ApiModelProperty(name = "data数组数据未转换",notes = "")
+ private JSONArray subDatas;
+}
diff --git a/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiTargetBillSub.java b/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiTargetBillSub.java
new file mode 100644
index 0000000..5bcd60b
--- /dev/null
+++ b/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiTargetBillSub.java
@@ -0,0 +1,95 @@
+package com.lzbi.draft.domain;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.lzbi.common.annotation.Excel;
+import com.lzbi.module.base.BaseModuleEntity;
+
+/**
+ * 指标数据采集(录入)明细对象 dc_busi_target_bill_sub
+ *
+ * @author zhousq
+ * @date 2023-12-14
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Accessors(chain = true)
+@ApiModel(value = "指标数据采集(录入)明细表",description = "")
+@TableName("dc_busi_target_bill_sub")
+public class DcBusiTargetBillSub extends BaseModuleEntity
+{
+ private static final long serialVersionUID = 1L;
+
+ /** 主键 */
+ @ApiModelProperty(name = "主键",notes = "")
+ private Long id;
+
+ /** 单据编码 */
+ @Excel(name = "单据编码")
+ @ApiModelProperty(name = "单据编码",notes = "")
+ private String billNo;
+
+ /** 指标名称 */
+ @Excel(name = "指标名称")
+ @ApiModelProperty(name = "指标名称",notes = "")
+ private String targetName;
+
+ /** 指标编码 */
+ @Excel(name = "指标编码")
+ @ApiModelProperty(name = "指标编码",notes = "")
+ private String targetCode;
+
+ /** 指标单位 */
+ @Excel(name = "指标单位")
+ @ApiModelProperty(name = "指标单位",notes = "")
+ private String targetUint;
+
+ /** 指标值 */
+ @Excel(name = "指标值")
+ @ApiModelProperty(name = "指标值",notes = "")
+ private Double targetValue;
+
+ /** 统计日期 */
+ @Excel(name = "统计日期")
+ @ApiModelProperty(name = "统计日期",notes = "")
+ private String countDate;
+
+ /** 天 */
+ @Excel(name = "天")
+ @ApiModelProperty(name = "天",notes = "")
+ private Integer countDay;
+
+ /** 所属专业编码 */
+ @Excel(name = "所属专业编码")
+ @ApiModelProperty(name = "所属专业编码",notes = "")
+ private String fieldCode;
+
+ /** 所属专业名称 */
+ @Excel(name = "所属专业名称")
+ @ApiModelProperty(name = "所属专业名称",notes = "")
+ private String fieldName;
+
+ /** 统计单元编码 */
+ @Excel(name = "统计单元编码")
+ @ApiModelProperty(name = "统计单元编码",notes = "")
+ private String assetCode;
+
+ /** 统计单元名称 */
+ @Excel(name = "统计单元名称")
+ @ApiModelProperty(name = "统计单元名称",notes = "")
+ private String assetName;
+
+
+}
diff --git a/lzbi-module/src/main/java/com/lzbi/draft/domain/DeptQueryParams.java b/lzbi-module/src/main/java/com/lzbi/draft/domain/DeptQueryParams.java
new file mode 100644
index 0000000..7f1a469
--- /dev/null
+++ b/lzbi-module/src/main/java/com/lzbi/draft/domain/DeptQueryParams.java
@@ -0,0 +1,21 @@
+package com.lzbi.draft.domain;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auth create by Administrator
+ * @date 2023/12/14
+ * DeptQueryParams
+ */
+@Data
+public class DeptQueryParams {
+ @ApiModelProperty("页码")
+ private Integer pageNum;
+ @ApiModelProperty("页长")
+ private Integer pageSize;
+ @ApiModelProperty("部门ID")
+ private Long deptId;
+ @ApiModelProperty("部门类型")
+ private String orgType;
+}
diff --git a/lzbi-module/src/main/java/com/lzbi/draft/mapper/DcBusiTargetBillMasterMapper.java b/lzbi-module/src/main/java/com/lzbi/draft/mapper/DcBusiTargetBillMasterMapper.java
new file mode 100644
index 0000000..46f2714
--- /dev/null
+++ b/lzbi-module/src/main/java/com/lzbi/draft/mapper/DcBusiTargetBillMasterMapper.java
@@ -0,0 +1,90 @@
+package com.lzbi.draft.mapper;
+
+import java.util.List;
+import com.lzbi.draft.domain.DcBusiTargetBillMaster;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lzbi.draft.domain.DcBusiTargetBillSub;
+
+/**
+ * 统计指标录入Mapper接口
+ *
+ * @author zhousq
+ * @date 2023-12-14
+ */
+
+public interface DcBusiTargetBillMasterMapper extends BaseMapper
+{
+ /**
+ * 查询统计指标录入
+ *
+ * @param id 统计指标录入主键
+ * @return 统计指标录入
+ */
+ public DcBusiTargetBillMaster selectDcBusiTargetBillMasterById(Long id);
+
+ /**
+ * 查询统计指标录入列表
+ *
+ * @param dcBusiTargetBillMaster 统计指标录入
+ * @return 统计指标录入集合
+ */
+ public List selectDcBusiTargetBillMasterList(DcBusiTargetBillMaster dcBusiTargetBillMaster);
+
+ /**
+ * 新增统计指标录入
+ *
+ * @param dcBusiTargetBillMaster 统计指标录入
+ * @return 结果
+ */
+ public int insertDcBusiTargetBillMaster(DcBusiTargetBillMaster dcBusiTargetBillMaster);
+
+ /**
+ * 修改统计指标录入
+ *
+ * @param dcBusiTargetBillMaster 统计指标录入
+ * @return 结果
+ */
+ public int updateDcBusiTargetBillMaster(DcBusiTargetBillMaster dcBusiTargetBillMaster);
+
+ /**
+ * 删除统计指标录入
+ *
+ * @param id 统计指标录入主键
+ * @return 结果
+ */
+ public int deleteDcBusiTargetBillMasterById(Long id);
+
+ /**
+ * 批量删除统计指标录入
+ *
+ * @param ids 需要删除的数据主键集合
+ * @return 结果
+ */
+ public int deleteDcBusiTargetBillMasterByIds(Long[] ids);
+ public List selectDcBusiTargetBillMasterBillNoByIds(Long[] ids);
+
+ /**
+ * 批量删除指标数据采集(录入)明细
+ *
+ * @param ids 需要删除的数据主键集合
+ * @return 结果
+ */
+ public int deleteDcBusiTargetBillSubByBillNos(List ids);
+
+ /**
+ * 批量新增指标数据采集(录入)明细
+ *
+ * @param dcBusiTargetBillSubList 指标数据采集(录入)明细列表
+ * @return 结果
+ */
+ public int batchDcBusiTargetBillSub(List dcBusiTargetBillSubList);
+
+
+ /**
+ * 通过统计指标录入主键删除指标数据采集(录入)明细信息
+ *
+ * @param id 统计指标录入ID
+ * @return 结果
+ */
+ public int deleteDcBusiTargetBillSubByBillNo(String billNo);
+}
diff --git a/lzbi-module/src/main/java/com/lzbi/draft/service/DcBusiTargetAdjustDaySubService.java b/lzbi-module/src/main/java/com/lzbi/draft/service/DcBusiTargetAdjustDaySubService.java
index 4ec41f1..0c32554 100644
--- a/lzbi-module/src/main/java/com/lzbi/draft/service/DcBusiTargetAdjustDaySubService.java
+++ b/lzbi-module/src/main/java/com/lzbi/draft/service/DcBusiTargetAdjustDaySubService.java
@@ -4,7 +4,7 @@ import java.util.List;
import com.lzbi.common.utils.DateUtils;
import com.lzbi.draft.domain.DcBusiTargetAdjustDaySubDao;
import com.lzbi.draft.mapper.DcBusiTargetAdjustDaySubMapper;
-import com.lzbi.targetFolder.domain.DcBaseAssetTargetDao;
+import com.lzbi.targetFolder.domain.DcBaseAssetTarget;
import com.lzbi.targetFolder.mapper.DcBaseAssetTargetMapper;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.stereotype.Service;
@@ -59,9 +59,9 @@ public class DcBusiTargetAdjustDaySubService extends ServiceImpl implements IService
+{
+
+ /**
+ * 查询统计指标录入
+ *
+ * @param id 统计指标录入主键
+ * @return 统计指标录入
+ */
+ public DcBusiTargetBillMaster selectDcBusiTargetBillMasterById(Long id)
+ {
+ return baseMapper.selectDcBusiTargetBillMasterById(id);
+ }
+
+ /**
+ * 查询统计指标录入列表
+ *
+ * @param dcBusiTargetBillMaster 统计指标录入
+ * @return 统计指标录入
+ */
+ public List selectDcBusiTargetBillMasterList(DcBusiTargetBillMaster dcBusiTargetBillMaster)
+ {
+ return baseMapper.selectDcBusiTargetBillMasterList(dcBusiTargetBillMaster);
+ }
+
+ /**
+ * 新增统计指标录入
+ *
+ * @param dcBusiTargetBillMaster 统计指标录入
+ * @return 结果
+ */
+ @Transactional
+
+ public int insertDcBusiTargetBillMaster(DcBusiTargetBillMaster dcBusiTargetBillMaster)
+ {
+ dcBusiTargetBillMaster.setCreatedTime(DateUtils.getNowDate());
+ int rows = baseMapper.insertDcBusiTargetBillMaster(dcBusiTargetBillMaster);
+ insertDcBusiTargetBillSub(dcBusiTargetBillMaster);
+ return rows;
+ }
+
+ /**
+ * 修改统计指标录入
+ *
+ * @param dcBusiTargetBillMaster 统计指标录入
+ * @return 结果
+ */
+ @Transactional
+
+ public int updateDcBusiTargetBillMaster(DcBusiTargetBillMaster dcBusiTargetBillMaster)
+ {
+ dcBusiTargetBillMaster.setUpdatedTime(DateUtils.getNowDate());
+ baseMapper.deleteDcBusiTargetBillSubByBillNo(dcBusiTargetBillMaster.getBillNo());
+ insertDcBusiTargetBillSub(dcBusiTargetBillMaster);
+ return baseMapper.updateDcBusiTargetBillMaster(dcBusiTargetBillMaster);
+ }
+
+ /**
+ * 批量删除统计指标录入
+ *
+ * @param ids 需要删除的统计指标录入主键
+ * @return 结果
+ */
+ @Transactional
+
+ public int deleteDcBusiTargetBillMasterByIds(Long[] ids)
+ {
+
+ List strings = baseMapper.selectDcBusiTargetBillMasterBillNoByIds(ids);
+ baseMapper.deleteDcBusiTargetBillSubByBillNos(strings);
+ return baseMapper.deleteDcBusiTargetBillMasterByIds(ids);
+ }
+
+ /**
+ * 删除统计指标录入信息
+ *
+ * @param id 统计指标录入主键
+ * @return 结果
+ */
+ @Transactional
+
+ public int deleteDcBusiTargetBillMasterById(Long id)
+ {
+ DcBusiTargetBillMaster dcBusiTargetBillMaster = baseMapper.selectDcBusiTargetBillMasterById(id);
+ baseMapper.deleteDcBusiTargetBillSubByBillNo(dcBusiTargetBillMaster.getBillNo());
+ return baseMapper.deleteDcBusiTargetBillMasterById(id);
+ }
+
+ /**
+ * 新增指标数据采集(录入)明细信息
+ *
+ * @param dcBusiTargetBillMaster 统计指标录入对象
+ */
+ public void insertDcBusiTargetBillSub(DcBusiTargetBillMaster dcBusiTargetBillMaster)
+ {
+ List dcBusiTargetBillSubDaoList = dcBusiTargetBillMaster.getDcBusiTargetBillSubList();
+ String billNo = dcBusiTargetBillMaster.getBillNo();
+ if (StringUtils.isNotNull(dcBusiTargetBillSubDaoList))
+ {
+ List list = new ArrayList();
+ for (DcBusiTargetBillSub dcBusiTargetBillSubDao : dcBusiTargetBillSubDaoList)
+ {
+ dcBusiTargetBillSubDao.setBillNo(billNo);
+ list.add(dcBusiTargetBillSubDao);
+ }
+ if (list.size() > 0)
+ {
+ baseMapper.batchDcBusiTargetBillSub(list);
+ }
+ }
+ }
+}
diff --git a/lzbi-module/src/main/java/com/lzbi/module/base/BaseModuleEntity.java b/lzbi-module/src/main/java/com/lzbi/module/base/BaseModuleEntity.java
index 3e8b425..46f7df6 100644
--- a/lzbi-module/src/main/java/com/lzbi/module/base/BaseModuleEntity.java
+++ b/lzbi-module/src/main/java/com/lzbi/module/base/BaseModuleEntity.java
@@ -65,7 +65,6 @@ public class BaseModuleEntity implements Serializable, Cloneable {
*/
@ApiModelProperty(name = "删除时间", notes = "")
private Date deleteTime;
-
@ApiModelProperty("分页")
private Integer pageNum;
@ApiModelProperty("分页大小")
diff --git a/lzbi-module/src/main/java/com/lzbi/targetFolder/controller/DcBaseAssetTargetController.java b/lzbi-module/src/main/java/com/lzbi/targetFolder/controller/DcBaseAssetTargetController.java
index 867d91e..a715896 100644
--- a/lzbi-module/src/main/java/com/lzbi/targetFolder/controller/DcBaseAssetTargetController.java
+++ b/lzbi-module/src/main/java/com/lzbi/targetFolder/controller/DcBaseAssetTargetController.java
@@ -1,8 +1,14 @@
package com.lzbi.targetFolder.controller;
+import java.util.ArrayList;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
+import com.lzbi.common.utils.DateUtils;
+import com.lzbi.targetFolder.domain.DcBaseAssetTarget;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -17,7 +23,6 @@ import com.lzbi.common.annotation.Log;
import com.lzbi.common.core.controller.BaseController;
import com.lzbi.common.core.domain.AjaxResult;
import com.lzbi.common.enums.BusinessType;
-import com.lzbi.targetFolder.domain.DcBaseAssetTargetDao;
import com.lzbi.targetFolder.service.DcBaseAssetTargetService;
import com.lzbi.common.utils.poi.ExcelUtil;
import com.lzbi.common.core.page.TableDataInfo;
@@ -40,10 +45,10 @@ public class DcBaseAssetTargetController extends BaseController
*/
@PreAuthorize("@ss.hasPermi('target:target:list')")
@GetMapping("/list")
- public TableDataInfo list(DcBaseAssetTargetDao dcBaseAssetTargetDao)
+ public TableDataInfo list(DcBaseAssetTarget dcBaseAssetTarget)
{
startPage();
- List list = dcBaseAssetTargetService.selectDcBaseAssetTargetDaoList(dcBaseAssetTargetDao);
+ List list = dcBaseAssetTargetService.selectDcBaseAssetTargetList(dcBaseAssetTarget);
return getDataTable(list);
}
@@ -53,10 +58,10 @@ public class DcBaseAssetTargetController extends BaseController
@PreAuthorize("@ss.hasPermi('target:target:export')")
@Log(title = "资产指标配置", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, DcBaseAssetTargetDao dcBaseAssetTargetDao)
+ public void export(HttpServletResponse response, DcBaseAssetTarget dcBaseAssetTarget)
{
- List list = dcBaseAssetTargetService.selectDcBaseAssetTargetDaoList(dcBaseAssetTargetDao);
- ExcelUtil util = new ExcelUtil(DcBaseAssetTargetDao.class);
+ List list = dcBaseAssetTargetService.selectDcBaseAssetTargetList(dcBaseAssetTarget);
+ ExcelUtil util = new ExcelUtil(DcBaseAssetTarget.class);
util.exportExcel(response, list, "资产指标配置数据");
}
@@ -67,7 +72,7 @@ public class DcBaseAssetTargetController extends BaseController
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
- return success(dcBaseAssetTargetService.selectDcBaseAssetTargetDaoById(id));
+ return success(dcBaseAssetTargetService.selectDcBaseAssetTargetById(id));
}
/**
@@ -76,9 +81,9 @@ public class DcBaseAssetTargetController extends BaseController
@PreAuthorize("@ss.hasPermi('target:target:add')")
@Log(title = "资产指标配置", businessType = BusinessType.INSERT)
@PostMapping
- public AjaxResult add(@RequestBody DcBaseAssetTargetDao dcBaseAssetTargetDao)
+ public AjaxResult add(@RequestBody DcBaseAssetTarget dcBaseAssetTarget)
{
- return toAjax(dcBaseAssetTargetService.insertDcBaseAssetTargetDao(dcBaseAssetTargetDao));
+ return toAjax(dcBaseAssetTargetService.insertDcBaseAssetTarget(dcBaseAssetTarget));
}
/**
@@ -87,9 +92,9 @@ public class DcBaseAssetTargetController extends BaseController
@PreAuthorize("@ss.hasPermi('target:target:edit')")
@Log(title = "资产指标配置", businessType = BusinessType.UPDATE)
@PutMapping
- public AjaxResult edit(@RequestBody DcBaseAssetTargetDao dcBaseAssetTargetDao)
+ public AjaxResult edit(@RequestBody DcBaseAssetTarget dcBaseAssetTarget)
{
- return toAjax(dcBaseAssetTargetService.updateDcBaseAssetTargetDao(dcBaseAssetTargetDao));
+ return toAjax(dcBaseAssetTargetService.updateDcBaseAssetTarget(dcBaseAssetTarget));
}
/**
@@ -100,7 +105,7 @@ public class DcBaseAssetTargetController extends BaseController
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
- return toAjax(dcBaseAssetTargetService.deleteDcBaseAssetTargetDaoByIds(ids));
+ return toAjax(dcBaseAssetTargetService.deleteDcBaseAssetTargetByIds(ids));
}
@@ -109,11 +114,71 @@ public class DcBaseAssetTargetController extends BaseController
*/
@PreAuthorize("@ss.hasPermi('target:target:list')")
@GetMapping("/listNoPage")
- public AjaxResult listNoPage(DcBaseAssetTargetDao dcBaseAssetTargetDao)
+ public AjaxResult listNoPage(DcBaseAssetTarget dcBaseAssetTarget)
{
- List list = dcBaseAssetTargetService.selectDcBaseAssetTargetDaoList(dcBaseAssetTargetDao);
+ List list = dcBaseAssetTargetService.selectDcBaseAssetTargetList(dcBaseAssetTarget);
return AjaxResult.success(list);
}
+ /**
+ * 新增资产信息
+ */
+ @PreAuthorize("@ss.hasPermi('lzbi:assetInfo:add')")
+ @Log(title = "资产信息", businessType = BusinessType.INSERT)
+ @PostMapping("/addBatch")
+ public AjaxResult addBatch(@RequestBody JSONArray jsonArray)
+ {
+ if (jsonArray == null) {
+ throw new IllegalArgumentException("未能接收任何参数!");
+ }
+ List beanList = new ArrayList<>();
+ try {
+ for (int i = 0; i < jsonArray.size(); i++) {
+ JSONObject beanObject = jsonArray.getJSONObject(i);
+ // 移除ID属性
+ beanObject.remove("id");
+ DcBaseAssetTarget dcBaseAssetTarget = JSON.toJavaObject(beanObject, DcBaseAssetTarget.class);
+ dcBaseAssetTarget.setCreatedTime(DateUtils.getNowDate());
+ dcBaseAssetTarget.setDeptId(getDeptId());
+ dcBaseAssetTarget.setUserId(getUserId());
+ dcBaseAssetTarget.setCreatedBy(String.valueOf(getUserId()));
+ dcBaseAssetTarget.setCreatedTime(DateUtils.getNowDate());
+ beanList.add(dcBaseAssetTarget);
+ }
+ } catch (Exception e) {
+ throw new IllegalArgumentException("解析list对象异常!");
+ }
+ return toAjax(dcBaseAssetTargetService.saveBatch(beanList));
+ }
+
+
+ /**
+ * 修改资产信息
+ */
+ @PreAuthorize("@ss.hasPermi('lzbi:assetInfo:edit')")
+ @Log(title = "资产信息", businessType = BusinessType.UPDATE)
+ @PutMapping("/editBatch")
+ public AjaxResult editBatch(@RequestBody JSONArray jsonArray)
+ {
+ if (jsonArray == null) {
+ throw new IllegalArgumentException("未能接收任何参数!");
+ }
+ List beanList = new ArrayList<>();
+ try {
+ for (int i = 0; i < jsonArray.size(); i++) {
+ JSONObject beanObject = jsonArray.getJSONObject(i);
+ DcBaseAssetTarget dcBaseAssetTarget = JSON.toJavaObject(beanObject, DcBaseAssetTarget.class);
+ dcBaseAssetTarget.setUpdatedBy(String.valueOf(getUserId()));
+ dcBaseAssetTarget.setUpdatedTime(DateUtils.getNowDate());
+ beanList.add(dcBaseAssetTarget);
+ }
+ } catch (Exception e) {
+ throw new IllegalArgumentException("解析list对象异常!");
+ }
+ return toAjax(dcBaseAssetTargetService.updateBatchById(beanList));
+ }
+
+
+
}
diff --git a/lzbi-module/src/main/java/com/lzbi/targetFolder/controller/DcBaseTargetModelController.java b/lzbi-module/src/main/java/com/lzbi/targetFolder/controller/DcBaseTargetModelController.java
index a891afd..c8a348e 100644
--- a/lzbi-module/src/main/java/com/lzbi/targetFolder/controller/DcBaseTargetModelController.java
+++ b/lzbi-module/src/main/java/com/lzbi/targetFolder/controller/DcBaseTargetModelController.java
@@ -197,6 +197,21 @@ public class DcBaseTargetModelController extends BaseController
}
+ /**
+ * 查询指标模版配置列表
+ */
+ @ApiOperation("查询指标模版配置列表")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "DcBaseTargetModel", value = "", dataType = "DcBaseTargetModel", dataTypeClass = DcBaseTargetModel.class),
+ })
+ @PreAuthorize("@ss.hasPermi('target:targetModel:list')")
+ @GetMapping("/listNoPage")
+ public AjaxResult listNoPage(DcBaseTargetModel DcBaseTargetModel)
+ {
+ List< DcBaseTargetModel> list = dcBaseTargetModelService.selectDcBaseTargetModelList(DcBaseTargetModel);
+ return AjaxResult.success(list);
+ }
+
}
diff --git a/lzbi-module/src/main/java/com/lzbi/targetFolder/domain/DcBaseAssetTargetDao.java b/lzbi-module/src/main/java/com/lzbi/targetFolder/domain/DcBaseAssetTarget.java
similarity index 66%
rename from lzbi-module/src/main/java/com/lzbi/targetFolder/domain/DcBaseAssetTargetDao.java
rename to lzbi-module/src/main/java/com/lzbi/targetFolder/domain/DcBaseAssetTarget.java
index c017b6f..427f0e9 100644
--- a/lzbi-module/src/main/java/com/lzbi/targetFolder/domain/DcBaseAssetTargetDao.java
+++ b/lzbi-module/src/main/java/com/lzbi/targetFolder/domain/DcBaseAssetTarget.java
@@ -2,32 +2,29 @@ package com.lzbi.targetFolder.domain;
import java.math.BigDecimal;
import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import io.swagger.annotations.ApiModelProperty;
+import lombok.experimental.Accessors;
import lombok.Data;
import com.lzbi.common.annotation.Excel;
import com.lzbi.module.base.BaseModuleEntity;
-import lombok.experimental.Accessors;
/**
* 资产指标配置对象 dc_base_asset_target
- *
+ *
* @author Lu.JL
- * @date 2023-11-30
+ * @date 2023-12-14
*/
- @Data
- @Accessors(chain = true)
-public class DcBaseAssetTargetDao extends BaseModuleEntity
+@Data
+@Accessors(chain = true)
+public class DcBaseAssetTarget extends BaseModuleEntity
{
private static final long serialVersionUID = 1L;
- @TableId(value = "id", type = IdType.AUTO)
- /** 主键 */
- private Long id;
- /** 资产ID */
- @Excel(name = "资产ID")
+ /** 统计单元编码 */
+ @Excel(name = "统计单元编码")
+ private String assetCode;
+
+ /** 统计单元ID */
+ @Excel(name = "统计单元ID")
private Long assetId;
/** 指标模型编码 */
@@ -38,6 +35,7 @@ public class DcBaseAssetTargetDao extends BaseModuleEntity
@Excel(name = "指标名称")
private String targetName;
+ /** 指标别名 */
@Excel(name = "指标别名")
private String targetNameAlias;
@@ -73,32 +71,20 @@ public class DcBaseAssetTargetDao extends BaseModuleEntity
@Excel(name = "是否积算")
private String flagCompute;
- /** 排序 */
- @Excel(name = "排序")
+ /** $column.columnComment */
+ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private String sort;
- /** 统计单元编码 */
- @Excel(name = "统计单元编码")
- private String assetCode;
- //add by zhousq 2023-12-12
- @ApiModelProperty("所属专业名称")
+ /** 所属专业名称 */
+ @Excel(name = "所属专业名称")
private String targetFieldName;
- @ApiModelProperty("单位")
- private String fieldUnit;
- @ApiModelProperty("字段类型")
- private String columnType;
-
- private String value;
- private String label;
- public String getValue() {
- return this.targetCode;
- }
-
-
- public String getLabel() {
- return this.targetCode;
- }
+ /** T指标P参数 */
+ @Excel(name = "T指标P参数")
+ private String columnType;
+ /** 单位 */
+ @Excel(name = "单位")
+ private String fieldUnit;
}
diff --git a/lzbi-module/src/main/java/com/lzbi/targetFolder/mapper/DcBaseAssetTargetMapper.java b/lzbi-module/src/main/java/com/lzbi/targetFolder/mapper/DcBaseAssetTargetMapper.java
index 83d0fd4..f647a4b 100644
--- a/lzbi-module/src/main/java/com/lzbi/targetFolder/mapper/DcBaseAssetTargetMapper.java
+++ b/lzbi-module/src/main/java/com/lzbi/targetFolder/mapper/DcBaseAssetTargetMapper.java
@@ -1,7 +1,8 @@
package com.lzbi.targetFolder.mapper;
import java.util.List;
-import com.lzbi.targetFolder.domain.DcBaseAssetTargetDao;
+
+import com.lzbi.targetFolder.domain.DcBaseAssetTarget;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -14,7 +15,7 @@ import org.apache.ibatis.annotations.Param;
*/
@Mapper
-public interface DcBaseAssetTargetMapper extends BaseMapper
+public interface DcBaseAssetTargetMapper extends BaseMapper
{
/**
* 查询资产指标配置
@@ -22,7 +23,7 @@ public interface DcBaseAssetTargetMapper extends BaseMapper selectDcBaseAssetTargetDaoList(DcBaseAssetTargetDao dcBaseAssetTargetDao);
+ public List selectDcBaseAssetTargetList(DcBaseAssetTarget dcBaseAssetTarget);
/**
* 新增资产指标配置
*
- * @param dcBaseAssetTargetDao 资产指标配置
+ * @param dcBaseAssetTarget 资产指标配置
* @return 结果
*/
- public int insertDcBaseAssetTargetDao(DcBaseAssetTargetDao dcBaseAssetTargetDao);
+ public int insertDcBaseAssetTarget(DcBaseAssetTarget dcBaseAssetTarget);
/**
* 修改资产指标配置
@@ -55,7 +56,7 @@ public interface DcBaseAssetTargetMapper extends BaseMapper implements IService
+public class DcBaseAssetTargetService extends ServiceImpl implements IService
{
@Autowired
private DcBaseAssetTargetMapper dcBaseAssetTargetMapper;
@@ -27,46 +27,46 @@ public class DcBaseAssetTargetService extends ServiceImpl selectDcBaseAssetTargetDaoList(DcBaseAssetTargetDao dcBaseAssetTargetDao)
+ public List selectDcBaseAssetTargetList(DcBaseAssetTarget dcBaseAssetTarget)
{
- return dcBaseAssetTargetMapper.selectDcBaseAssetTargetDaoList(dcBaseAssetTargetDao);
+ return dcBaseAssetTargetMapper.selectDcBaseAssetTargetList(dcBaseAssetTarget);
}
/**
* 新增资产指标配置
*
- * @param dcBaseAssetTargetDao 资产指标配置
+ * @param dcBaseAssetTarget 资产指标配置
* @return 结果
*/
- public int insertDcBaseAssetTargetDao(DcBaseAssetTargetDao dcBaseAssetTargetDao)
+ public int insertDcBaseAssetTarget(DcBaseAssetTarget dcBaseAssetTarget)
{
- dcBaseAssetTargetDao.setCreatedTime(DateUtils.getNowDate());
- return dcBaseAssetTargetMapper.insertDcBaseAssetTargetDao(dcBaseAssetTargetDao);
+ dcBaseAssetTarget.setCreatedTime(DateUtils.getNowDate());
+ return dcBaseAssetTargetMapper.insertDcBaseAssetTarget(dcBaseAssetTarget);
}
/**
* 修改资产指标配置
*
- * @param dcBaseAssetTargetDao 资产指标配置
+ * @param dcBaseAssetTarget 资产指标配置
* @return 结果
*/
- public int updateDcBaseAssetTargetDao(DcBaseAssetTargetDao dcBaseAssetTargetDao)
+ public int updateDcBaseAssetTarget(DcBaseAssetTarget dcBaseAssetTarget)
{
- dcBaseAssetTargetDao.setUpdatedTime(DateUtils.getNowDate());
- return dcBaseAssetTargetMapper.updateDcBaseAssetTargetDao(dcBaseAssetTargetDao);
+ dcBaseAssetTarget.setUpdatedTime(DateUtils.getNowDate());
+ return dcBaseAssetTargetMapper.updateDcBaseAssetTarget(dcBaseAssetTarget);
}
/**
@@ -76,9 +76,9 @@ public class DcBaseAssetTargetService extends ServiceImpl
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- select TENANT_ID,
- REVISION,
- CREATED_BY,
- CREATED_TIME,
- UPDATED_BY,
- UPDATED_TIME,
- DELETE_BY,
- DELETE_TIME,
- id,
- asset_name,
- asset_code,
- asset_class,
- flag_validate_dept,
- flag_validate_role,
- flag_validate_user,
- status_asset,
- comany_id,
- dept_id
- from dc_base_asset_info
+ select tenant_id, revision, created_by, created_time, updated_by, updated_time, delete_by, delete_time, id, asset_name, asset_code, asset_class, flag_validate_dept, flag_validate_role, flag_validate_user, status_asset, comany_id, dept_id, user_id from dc_base_asset_info
+
+
-
-
-
insert into dc_base_asset_info
- TENANT_ID,
- REVISION,
- CREATED_BY,
- CREATED_TIME,
- UPDATED_BY,
- UPDATED_TIME,
- DELETE_BY,
- DELETE_TIME,
+ tenant_id,
+ revision,
+ created_by,
+ created_time,
+ updated_by,
+ updated_time,
+ delete_by,
+ delete_time,
asset_name,
asset_code,
asset_class,
@@ -101,10 +71,11 @@
status_asset,
comany_id,
dept_id,
+ user_id,
#{tenantId},
- #{REVISION},
+ #{revision},
#{createdBy},
#{createdTime},
#{updatedBy},
@@ -120,20 +91,21 @@
#{statusAsset},
#{comanyId},
#{deptId},
+ #{userId},
update dc_base_asset_info
- TENANT_ID = #{tenantId},
- REVISION = #{REVISION},
- CREATED_BY = #{createdBy},
- CREATED_TIME = #{createdTime},
- UPDATED_BY = #{updatedBy},
- UPDATED_TIME = #{updatedTime},
- DELETE_BY = #{deleteBy},
- DELETE_TIME = #{deleteTime},
+ tenant_id = #{tenantId},
+ revision = #{revision},
+ created_by = #{createdBy},
+ created_time = #{createdTime},
+ updated_by = #{updatedBy},
+ updated_time = #{updatedTime},
+ delete_by = #{deleteBy},
+ delete_time = #{deleteTime},
asset_name = #{assetName},
asset_code = #{assetCode},
asset_class = #{assetClass},
@@ -143,14 +115,13 @@
status_asset = #{statusAsset},
comany_id = #{comanyId},
dept_id = #{deptId},
+ user_id = #{userId},
where id = #{id}
- delete
- from dc_base_asset_info
- where id = #{id}
+ delete from dc_base_asset_info where id = #{id}
diff --git a/lzbi-module/src/main/resources/mapper/asset/DcBaseCoderuleDefineMapper.xml b/lzbi-module/src/main/resources/mapper/asset/DcBaseCoderuleDefineMapper.xml
index 423eea2..5b2809f 100644
--- a/lzbi-module/src/main/resources/mapper/asset/DcBaseCoderuleDefineMapper.xml
+++ b/lzbi-module/src/main/resources/mapper/asset/DcBaseCoderuleDefineMapper.xml
@@ -129,10 +129,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{codeSplitFlag},
-
+
insert into dc_base_coderule_serial(code_rule_id,serial_id,revision) values (#{param1},0,0)
-
+
+ delete from dc_base_coderule_serial where code_rule_id=#{param1}
+
update dc_base_coderule_define
@@ -163,8 +165,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{id}
-
+
+
+ delete from dc_base_coderule_serial where code_rule_id in
+
+ #{id}
+
+
@@ -48,7 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- select tenant_id, revision, created_by, created_time, updated_by, updated_time, delete_by, delete_time, dept_id, role_id, bill_model_no, bill_model_name, field_code, company_name, company_id, bill_model_point, org_name, org_id, id, data_state, use_state, field_name from dc_busi_bill_model_master
+ select tenant_id, revision, created_by, created_time, updated_by, updated_time, delete_by, delete_time, dept_id, role_id, bill_model_no, bill_model_name, field_code, company_name, company_id, bill_model_point, org_name, org_id, id, data_state, use_state, field_name,model_type from dc_busi_bill_model_master