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/common/SelectOptionsControl.java b/lzbi-module/src/main/java/com/lzbi/common/SelectOptionsControl.java
index 84b6889..c221a08 100644
--- a/lzbi-module/src/main/java/com/lzbi/common/SelectOptionsControl.java
+++ b/lzbi-module/src/main/java/com/lzbi/common/SelectOptionsControl.java
@@ -116,6 +116,7 @@ public class SelectOptionsControl extends BaseController {
{
DcBaseAssetTargetDao dcBaseAssetTargetDao=new DcBaseAssetTargetDao();
dcBaseAssetTargetDao.setAssetCode(assetQueryParams.getAssetCode());
+ dcBaseAssetTargetDao.setTargetField(assetQueryParams.getFieldCode());
dcBaseAssetTargetDao.setColumnType("T");
//dcBaseAssetTargetDao.setAssetId(assetQueryParams.getAssetId());
return AjaxResult.success(dcBaseAssetTargetService.selectDcBaseAssetTargetDaoList(dcBaseAssetTargetDao));
diff --git a/lzbi-module/src/main/java/com/lzbi/draft/controller/DcBusiParamCollectBill.java b/lzbi-module/src/main/java/com/lzbi/draft/controller/DcBusiParamCollectBill.java
index 8ec5f79..4461eeb 100644
--- a/lzbi-module/src/main/java/com/lzbi/draft/controller/DcBusiParamCollectBill.java
+++ b/lzbi-module/src/main/java/com/lzbi/draft/controller/DcBusiParamCollectBill.java
@@ -201,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数组方式")
@@ -217,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/DcBusiTargetCollectBill.java b/lzbi-module/src/main/java/com/lzbi/draft/controller/DcBusiTargetCollectBill.java
index 04daeec..2ad3bea 100644
--- a/lzbi-module/src/main/java/com/lzbi/draft/controller/DcBusiTargetCollectBill.java
+++ b/lzbi-module/src/main/java/com/lzbi/draft/controller/DcBusiTargetCollectBill.java
@@ -197,6 +197,16 @@ public class DcBusiTargetCollectBill extends BaseController
@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数组方式")
@@ -213,6 +223,15 @@ public class DcBusiTargetCollectBill extends BaseController
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);