Browse Source

Merge branch 'develop' of https://gitee.com/lmlz_0/manage into develop

# Conflicts:
#	lzbi-module/src/main/java/com/lzbi/draft/mapper/DcBusiTargetDraftDayMapper.java
develop
bobol 12 months ago
parent
commit
52299945c1
  1. 53
      lzbi-generator/src/main/resources/vm/java/controller.java.vm
  2. 2
      lzbi-generator/src/main/resources/vm/java/domain.java.vm
  3. 30
      lzbi-generator/src/main/resources/vm/java/mapper.java.vm
  4. 58
      lzbi-generator/src/main/resources/vm/java/service.java.vm
  5. 2
      lzbi-generator/src/main/resources/vm/java/sub-domain.java.vm
  6. 20
      lzbi-generator/src/main/resources/vm/xml/mapper.xml.vm
  7. 40
      lzbi-module/src/main/java/com/lzbi/common/SelectOptionsControl.java
  8. 26
      lzbi-module/src/main/java/com/lzbi/draft/controller/DcBusiTargetDraftDayController.java
  9. 11
      lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiTargetDraftDay.java
  10. 21
      lzbi-module/src/main/java/com/lzbi/draft/mapper/DcBusiTargetDraftDayMapper.java
  11. 38
      lzbi-module/src/main/java/com/lzbi/draft/service/DcBusiTargetDraftDayService.java
  12. 130
      lzbi-module/src/main/resources/mapper/asset/DcBusiTargetDraftDayMapper.xml

53
lzbi-generator/src/main/resources/vm/java/controller.java.vm

@ -16,7 +16,7 @@ import com.lzbi.common.annotation.Log;
import com.lzbi.common.core.controller.BaseController; import com.lzbi.common.core.controller.BaseController;
import com.lzbi.common.core.domain.AjaxResult; import com.lzbi.common.core.domain.AjaxResult;
import com.lzbi.common.enums.BusinessType; import com.lzbi.common.enums.BusinessType;
import ${packageName}.domain.${ClassName}Dao; import ${packageName}.domain. ${ClassName};
import ${packageName}.service.${ClassName}Service; import ${packageName}.service.${ClassName}Service;
import com.lzbi.common.utils.poi.ExcelUtil; import com.lzbi.common.utils.poi.ExcelUtil;
#if($table.crud || $table.sub) #if($table.crud || $table.sub)
@ -40,19 +40,23 @@ public class ${ClassName}Controller extends BaseController
/** /**
* 查询${functionName}列表 * 查询${functionName}列表
*/ */
@ApiOperation("查询${functionName}列表")
@ApiImplicitParams({
@ApiImplicitParam(name = "${ClassName}", value = "", dataType = "${ClassName}", dataTypeClass = ${ClassName}.class),
})
@PreAuthorize("@ss.hasPermi('${permissionPrefix}:list')") @PreAuthorize("@ss.hasPermi('${permissionPrefix}:list')")
@GetMapping("/list") @GetMapping("/list")
#if($table.crud || $table.sub) #if($table.crud || $table.sub)
public TableDataInfo list(${ClassName}Dao ${className}Dao) public TableDataInfo list(${ClassName} ${ClassName})
{ {
startPage(); startPage();
List<${ClassName}Dao> list = ${className}Service.select${ClassName}DaoList(${className}Dao); List< ${ClassName}> list = ${className}Service.select ${ClassName}List(${ClassName});
return getDataTable(list); return getDataTable(list);
} }
#elseif($table.tree) #elseif($table.tree)
public AjaxResult list(${ClassName}Dao ${className}Dao) public AjaxResult list(${ClassName} ${ClassName})
{ {
List<${ClassName}Dao> list = ${className}Service.select${ClassName}DaoList(${className}Dao); List< ${ClassName}> list = ${className}Service.select ${ClassName}List(${ClassName});
return success(list); return success(list);
} }
#end #end
@ -60,56 +64,77 @@ public class ${ClassName}Controller extends BaseController
/** /**
* 导出${functionName}列表 * 导出${functionName}列表
*/ */
@ApiOperation("导出${functionName}列表")
@ApiImplicitParams({
@ApiImplicitParam(name = "${ClassName}", value = "", dataType = "${ClassName}", dataTypeClass = ${ClassName}.class),
})
@PreAuthorize("@ss.hasPermi('${permissionPrefix}:export')") @PreAuthorize("@ss.hasPermi('${permissionPrefix}:export')")
@Log(title = "${functionName}", businessType = BusinessType.EXPORT) @Log(title = "${functionName}", businessType = BusinessType.EXPORT)
@PostMapping("/export") @PostMapping("/export")
public void export(HttpServletResponse response, ${ClassName}Dao ${className}Dao) public void export(HttpServletResponse response, ${ClassName} ${ClassName})
{ {
List<${ClassName}Dao> list = ${className}Service.select${ClassName}DaoList(${className}Dao); List< ${ClassName}> list = ${className}Service.select ${ClassName}List(${ClassName});
ExcelUtil<${ClassName}Dao> util = new ExcelUtil<${ClassName}Dao>(${ClassName}Dao.class); ExcelUtil< ${ClassName}> util = new ExcelUtil<(${ClassName}>(${ClassName}.class);
util.exportExcel(response, list, "${functionName}数据"); util.exportExcel(response, list, "${functionName}数据");
} }
/** /**
* 获取${functionName}详细信息 * 获取${functionName}详细信息
*/ */
@ApiOperation("获取${functionName}详细信息")
@ApiImplicitParams({
@ApiImplicitParam(name = "${pkColumn.javaField}", value = "", dataType = "${pkColumn.javaType}", dataTypeClass = ${pkColumn.javaType}.class),
})
@PreAuthorize("@ss.hasPermi('${permissionPrefix}:query')") @PreAuthorize("@ss.hasPermi('${permissionPrefix}:query')")
@GetMapping(value = "/{${pkColumn.javaField}}") @GetMapping(value = "/{${pkColumn.javaField}}")
public AjaxResult getInfo(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField}) public AjaxResult getInfo(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField})
{ {
return success(${className}Service.select${ClassName}DaoBy${pkColumn.capJavaField}(${pkColumn.javaField})); return success(${className}Service.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField}));
} }
/** /**
* 新增${functionName} * 新增${functionName}
*/ */
@ApiOperation("新增${functionName}")
@ApiImplicitParams({
@ApiImplicitParam(name = "${ClassName}", value = "", dataType = "${ClassName}", dataTypeClass = ${ClassName}.class),
})
@PreAuthorize("@ss.hasPermi('${permissionPrefix}:add')") @PreAuthorize("@ss.hasPermi('${permissionPrefix}:add')")
@Log(title = "${functionName}", businessType = BusinessType.INSERT) @Log(title = "${functionName}", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody ${ClassName}Dao ${className}Dao) public AjaxResult add(@RequestBody ${ClassName} ${ClassName})
{ {
return toAjax(${className}Service.insert${ClassName}Dao(${className}Dao)); return toAjax(${className}Service.insert${ClassName}(${ClassName}));
} }
/** /**
* 修改${functionName} * 修改${functionName}
*/ */
@ApiOperation("修改${functionName}")
@ApiImplicitParams({
@ApiImplicitParam(name = "${ClassName}", value = "", dataType = "${ClassName}", dataTypeClass = ${ClassName}.class),
})
@PreAuthorize("@ss.hasPermi('${permissionPrefix}:edit')") @PreAuthorize("@ss.hasPermi('${permissionPrefix}:edit')")
@Log(title = "${functionName}", businessType = BusinessType.UPDATE) @Log(title = "${functionName}", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody ${ClassName}Dao ${className}Dao) public AjaxResult edit(@RequestBody ${ClassName} ${ClassName})
{ {
return toAjax(${className}Service.update${ClassName}Dao(${className}Dao)); return toAjax(${className}Service.update${ClassName}(${ClassName}));
} }
/** /**
* 删除${functionName} * 删除${functionName}
*/ */
@ApiOperation("删除${functionName}")
@ApiImplicitParams({
@ApiImplicitParam(name = "${pkColumn.javaField}s", value = "", dataType = "${pkColumn.javaType}", dataTypeClass =${pkColumn.javaType}.class),
})
@PreAuthorize("@ss.hasPermi('${permissionPrefix}:remove')") @PreAuthorize("@ss.hasPermi('${permissionPrefix}:remove')")
@Log(title = "${functionName}", businessType = BusinessType.DELETE) @Log(title = "${functionName}", businessType = BusinessType.DELETE)
@DeleteMapping("/{${pkColumn.javaField}s}") @DeleteMapping("/{${pkColumn.javaField}s}")
public AjaxResult remove(@PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s) public AjaxResult remove(@PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s)
{ {
return toAjax(${className}Service.delete${ClassName}DaoBy${pkColumn.capJavaField}s(${pkColumn.javaField}s)); return toAjax(${className}Service.delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaField}s));
} }
} }

2
lzbi-generator/src/main/resources/vm/java/domain.java.vm

@ -25,7 +25,7 @@ import com.lzbi.common.core.domain.TreeEntity;
#set($Entity="TreeEntity") #set($Entity="TreeEntity")
#end #end
@Data @Data
public class ${ClassName}Dao extends ${Entity} public class ${ClassName} extends ${Entity}
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;

30
lzbi-generator/src/main/resources/vm/java/mapper.java.vm

@ -1,10 +1,10 @@
package ${packageName}.mapper; package ${packageName}.mapper;
import java.util.List; import java.util.List;
import ${packageName}.domain.${ClassName}Dao; import ${packageName}.domain.${ClassName};
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
#if($table.sub) #if($table.sub)
import ${packageName}.domain.${subClassName}Dao; import ${packageName}.domain.${subClassName};
#end #end
/** /**
@ -14,7 +14,7 @@ import ${packageName}.domain.${subClassName}Dao;
* @date ${datetime} * @date ${datetime}
*/ */
public interface ${ClassName}Mapper extends BaseMapper<${ClassName}Dao> public interface ${ClassName}Mapper extends BaseMapper<${ClassName}>
{ {
/** /**
* 查询${functionName} * 查询${functionName}
@ -22,23 +22,23 @@ public interface ${ClassName}Mapper extends BaseMapper<${ClassName}Dao>
* @param ${pkColumn.javaField} ${functionName}主键 * @param ${pkColumn.javaField} ${functionName}主键
* @return ${functionName} * @return ${functionName}
*/ */
public ${ClassName}Dao select${ClassName}DaoBy${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}); public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
/** /**
* 查询${functionName}列表 * 查询${functionName}列表
* *
* @param ${className}Dao ${functionName} * @param ${className} ${functionName}
* @return ${functionName}集合 * @return ${functionName}集合
*/ */
public List<${ClassName}Dao> select${ClassName}DaoList(${ClassName}Dao ${className}Dao); public List<${ClassName}> select${ClassName}List(${ClassName} ${className});
/** /**
* 新增${functionName} * 新增${functionName}
* *
* @param ${className}Dao ${functionName} * @param ${className} ${functionName}
* @return 结果 * @return 结果
*/ */
public int insert${ClassName}Dao(${ClassName}Dao ${className}Dao); public int insert${ClassName}(${ClassName} ${className});
/** /**
* 修改${functionName} * 修改${functionName}
@ -46,7 +46,7 @@ public interface ${ClassName}Mapper extends BaseMapper<${ClassName}Dao>
* @param ${className} ${functionName} * @param ${className} ${functionName}
* @return 结果 * @return 结果
*/ */
public int update${ClassName}Dao(${ClassName}Dao ${className}Dao); public int update${ClassName}(${ClassName} ${className});
/** /**
* 删除${functionName} * 删除${functionName}
@ -54,7 +54,7 @@ public interface ${ClassName}Mapper extends BaseMapper<${ClassName}Dao>
* @param ${pkColumn.javaField} ${functionName}主键 * @param ${pkColumn.javaField} ${functionName}主键
* @return 结果 * @return 结果
*/ */
public int delete${ClassName}DaoBy${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}); public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
/** /**
* 批量删除${functionName} * 批量删除${functionName}
@ -62,7 +62,7 @@ public interface ${ClassName}Mapper extends BaseMapper<${ClassName}Dao>
* @param ${pkColumn.javaField}s 需要删除的数据主键集合 * @param ${pkColumn.javaField}s 需要删除的数据主键集合
* @return 结果 * @return 结果
*/ */
public int delete${ClassName}DaoBy${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s); public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s);
#if($table.sub) #if($table.sub)
/** /**
@ -71,15 +71,15 @@ public interface ${ClassName}Mapper extends BaseMapper<${ClassName}Dao>
* @param ${pkColumn.javaField}s 需要删除的数据主键集合 * @param ${pkColumn.javaField}s 需要删除的数据主键集合
* @return 结果 * @return 结果
*/ */
public int delete${subClassName}DaoBy${subTableFkClassName}Daos(${pkColumn.javaType}[] ${pkColumn.javaField}s); public int delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaType}[] ${pkColumn.javaField}s);
/** /**
* 批量新增${subTable.functionName} * 批量新增${subTable.functionName}
* *
* @param ${subclassName}DaoList ${subTable.functionName}列表 * @param ${subclassName}List ${subTable.functionName}列表
* @return 结果 * @return 结果
*/ */
public int batch${subClassName}Dao(List<${subClassName}Dao> ${subclassName}DaoList); public int batch${subClassName}(List<${subClassName}> ${subclassName}List);
/** /**
@ -88,6 +88,6 @@ public interface ${ClassName}Mapper extends BaseMapper<${ClassName}Dao>
* @param ${pkColumn.javaField} ${functionName}ID * @param ${pkColumn.javaField} ${functionName}ID
* @return 结果 * @return 结果
*/ */
public int delete${subClassName}DaoBy${subTableFkClassName}Dao(${pkColumn.javaType} ${pkColumn.javaField}); public int delete${subClassName}By${subTableFkClassName}(${pkColumn.javaType} ${pkColumn.javaField});
#end #end
} }

58
lzbi-generator/src/main/resources/vm/java/service.java.vm

@ -12,9 +12,9 @@ import org.springframework.stereotype.Service;
import java.util.ArrayList; import java.util.ArrayList;
import com.lzbi.common.utils.DateUtils; import com.lzbi.common.utils.DateUtils;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import ${packageName}.domain.${subClassName}Dao; import ${packageName}.domain.${subClassName};
#end #end
import ${packageName}.domain.${ClassName}Dao; import ${packageName}.domain.${ClassName};
import ${packageName}.mapper.${ClassName}Mapper; import ${packageName}.mapper.${ClassName}Mapper;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@ -25,7 +25,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
* @date ${datetime} * @date ${datetime}
*/ */
@Service @Service
public class ${ClassName}Service extends ServiceImpl<${ClassName}Mapper, ${ClassName}Dao> implements IService<${ClassName}Dao> public class ${ClassName}Service extends ServiceImpl<${ClassName}Mapper, ${ClassName}> implements IService<${ClassName}>
{ {
/** /**
@ -34,70 +34,70 @@ public class ${ClassName}Service extends ServiceImpl<${ClassName}Mapper, ${Class
* @param ${pkColumn.javaField} ${functionName}主键 * @param ${pkColumn.javaField} ${functionName}主键
* @return ${functionName} * @return ${functionName}
*/ */
public ${ClassName}Dao select${ClassName}DaoBy${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}) public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField})
{ {
return baseMapper.select${ClassName}DaoBy${pkColumn.capJavaField}(${pkColumn.javaField}); return baseMapper.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField});
} }
/** /**
* 查询${functionName}列表 * 查询${functionName}列表
* *
* @param ${className}Dao ${functionName} * @param ${className} ${functionName}
* @return ${functionName} * @return ${functionName}
*/ */
public List<${ClassName}Dao> select${ClassName}DaoList(${ClassName}Dao ${className}Dao) public List<${ClassName}> select${ClassName}List(${ClassName} ${className})
{ {
return baseMapper.select${ClassName}DaoList(${className}Dao); return baseMapper.select${ClassName}List(${className});
} }
/** /**
* 新增${functionName} * 新增${functionName}
* *
* @param ${className}Dao ${functionName} * @param ${className} ${functionName}
* @return 结果 * @return 结果
*/ */
#if($table.sub) #if($table.sub)
@Transactional @Transactional
#end #end
public int insert${ClassName}Dao(${ClassName}Dao ${className}Dao) public int insert${ClassName}(${ClassName} ${className})
{ {
#foreach ($column in $columns) #foreach ($column in $columns)
#if($column.javaField == 'createdTime') #if($column.javaField == 'createdTime')
${className}Dao.setCreatedTime(DateUtils.getNowDate()); ${className}.setCreatedTime(DateUtils.getNowDate());
#end #end
#end #end
#if($table.sub) #if($table.sub)
int rows = baseMapper.insert${ClassName}Dao(${className}Dao); int rows = baseMapper.insert${ClassName}(${className});
insert${subClassName}Dao(${className}Dao); insert${subClassName}(${className});
return rows; return rows;
#else #else
return baseMapper.insert${ClassName}Dao(${className}Dao); return baseMapper.insert${ClassName}(${className});
#end #end
} }
/** /**
* 修改${functionName} * 修改${functionName}
* *
* @param ${className}Dao ${functionName} * @param ${className} ${functionName}
* @return 结果 * @return 结果
*/ */
#if($table.sub) #if($table.sub)
@Transactional @Transactional
#end #end
public int update${ClassName}Dao(${ClassName}Dao ${className}Dao) public int update${ClassName}(${ClassName} ${className})
{ {
#foreach ($column in $columns) #foreach ($column in $columns)
#if($column.javaField == 'updatedTime') #if($column.javaField == 'updatedTime')
${className}Dao.setUpdatedTime(DateUtils.getNowDate()); ${className}.setUpdatedTime(DateUtils.getNowDate());
#end #end
#end #end
#if($table.sub) #if($table.sub)
baseMapper.delete${subClassName}By${subTableFkClassName}(${className}Dao.get${pkColumn.capJavaField}()); baseMapper.delete${subClassName}By${subTableFkClassName}(${className}.get${pkColumn.capJavaField}());
insert${subClassName}Dao(${className}Dao); insert${subClassName}(${className});
#end #end
return baseMapper.update${ClassName}Dao(${className}Dao); return baseMapper.update${ClassName}(${className});
} }
/** /**
@ -110,12 +110,12 @@ public class ${ClassName}Service extends ServiceImpl<${ClassName}Mapper, ${Class
@Transactional @Transactional
#end #end
public int delete${ClassName}DaoBy${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s) public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s)
{ {
#if($table.sub) #if($table.sub)
baseMapper.delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaField}s); baseMapper.delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaField}s);
#end #end
return baseMapper.delete${ClassName}DaoBy${pkColumn.capJavaField}s(${pkColumn.javaField}s); return baseMapper.delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaField}s);
} }
/** /**
@ -128,28 +128,28 @@ public class ${ClassName}Service extends ServiceImpl<${ClassName}Mapper, ${Class
@Transactional @Transactional
#end #end
public int delete${ClassName}DaoBy${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}) public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField})
{ {
#if($table.sub) #if($table.sub)
baseMapper.delete${subClassName}By${subTableFkClassName}(${pkColumn.javaField}); baseMapper.delete${subClassName}By${subTableFkClassName}(${pkColumn.javaField});
#end #end
return baseMapper.delete${ClassName}DaoBy${pkColumn.capJavaField}(${pkColumn.javaField}); return baseMapper.delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField});
} }
#if($table.sub) #if($table.sub)
/** /**
* 新增${subTable.functionName}信息 * 新增${subTable.functionName}信息
* *
* @param ${className}Dao ${functionName}对象 * @param ${className} ${functionName}对象
*/ */
public void insert${subClassName}Dao(${ClassName}Dao ${className}Dao) public void insert${subClassName}(${ClassName} ${className})
{ {
List<${subClassName}Dao> ${subclassName}DaoList = ${className}Dao.get${subClassName}DaoList(); List<${subClassName}> ${subclassName}DaoList = ${className}.get${subClassName}List();
${pkColumn.javaType} ${pkColumn.javaField} = ${className}.get${pkColumn.capJavaField}(); ${pkColumn.javaType} ${pkColumn.javaField} = ${className}.get${pkColumn.capJavaField}();
if (StringUtils.isNotNull(${subclassName}DaoList)) if (StringUtils.isNotNull(${subclassName}DaoList))
{ {
List<${subClassName}Dao> list = new ArrayList<${subClassName}Dao>(); List<${subClassName}> list = new ArrayList<${subClassName}>();
for (${subClassName}Dao ${subclassName}Dao : ${subclassName}DaoList) for (${subClassName} ${subclassName}Dao : ${subclassName}DaoList)
{ {
${subclassName}Dao.set${subTableFkClassName}(${pkColumn.javaField}); ${subclassName}Dao.set${subTableFkClassName}(${pkColumn.javaField});
list.add(${subclassName}Dao); list.add(${subclassName}Dao);

2
lzbi-generator/src/main/resources/vm/java/sub-domain.java.vm

@ -14,7 +14,7 @@ import com.lzbi.module.base.BaseModuleEntity;
* @author ${author} * @author ${author}
* @date ${datetime} * @date ${datetime}
*/ */
public class ${subClassName}Dao extends BaseModuleEntity public class ${subClassName} extends BaseModuleEntity
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;

20
lzbi-generator/src/main/resources/vm/xml/mapper.xml.vm

@ -4,18 +4,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="${packageName}.mapper.${ClassName}Mapper"> <mapper namespace="${packageName}.mapper.${ClassName}Mapper">
<resultMap type="${packageName}.domain.${ClassName}Dao" id="${ClassName}Result"> <resultMap type="${packageName}.domain.${ClassName}" id="${ClassName}Result">
#foreach ($column in $columns) #foreach ($column in $columns)
<result property="${column.javaField}" column="${column.columnName}" /> <result property="${column.javaField}" column="${column.columnName}" />
#end #end
</resultMap> </resultMap>
#if($table.sub) #if($table.sub)
<resultMap id="${ClassName}${subClassName}DaoResult" type="${ClassName}Dao" extends="${ClassName}Result"> <resultMap id="${ClassName}${subClassName}Result" type="${ClassName}" extends="${ClassName}Result">
<collection property="${subclassName}DaoList" notNullColumn="sub_${subTable.pkColumn.columnName}" javaType="java.util.List" resultMap="${subClassName}Result" /> <collection property="${subclassName}List" notNullColumn="sub_${subTable.pkColumn.columnName}" javaType="java.util.List" resultMap="${subClassName}Result" />
</resultMap> </resultMap>
<resultMap type="${subClassName}Dao" id="${subClassName}Result"> <resultMap type="${subClassName}" id="${subClassName}Result">
#foreach ($column in $subTable.columns) #foreach ($column in $subTable.columns)
<result property="${column.javaField}" column="sub_${column.columnName}" /> <result property="${column.javaField}" column="sub_${column.columnName}" />
#end #end
@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select#foreach($column in $columns) $column.columnName#if($foreach.count != $columns.size()),#end#end from ${tableName} select#foreach($column in $columns) $column.columnName#if($foreach.count != $columns.size()),#end#end from ${tableName}
</sql> </sql>
<select id="select${ClassName}DaoList" parameterType="${ClassName}Dao" resultMap="${ClassName}Result"> <select id="select${ClassName}List" parameterType="${ClassName}" resultMap="${ClassName}Result">
<include refid="select${ClassName}Vo"/> <include refid="select${ClassName}Vo"/>
<where> <where>
#foreach($column in $columns) #foreach($column in $columns)
@ -58,7 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where> </where>
</select> </select>
<select id="select${ClassName}DaoBy${pkColumn.capJavaField}" parameterType="${pkColumn.javaType}" resultMap="#if($table.sub)${ClassName}${subClassName}DaoResult#else${ClassName}Result#end"> <select id="select${ClassName}By${pkColumn.capJavaField}" parameterType="${pkColumn.javaType}" resultMap="#if($table.sub)${ClassName}${subClassName}Result#else${ClassName}Result#end">
#if($table.crud || $table.tree) #if($table.crud || $table.tree)
<include refid="select${ClassName}Vo"/> <include refid="select${ClassName}Vo"/>
where ${pkColumn.columnName} = #{${pkColumn.javaField}} where ${pkColumn.columnName} = #{${pkColumn.javaField}}
@ -72,7 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#end #end
</select> </select>
<insert id="insert${ClassName}Dao" parameterType="${ClassName}Dao"#if($pkColumn.increment) useGeneratedKeys="true" keyProperty="$pkColumn.javaField"#end> <insert id="insert${ClassName}" parameterType="${ClassName}"#if($pkColumn.increment) useGeneratedKeys="true" keyProperty="$pkColumn.javaField"#end>
insert into ${tableName} insert into ${tableName}
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
#foreach($column in $columns) #foreach($column in $columns)
@ -90,7 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</trim> </trim>
</insert> </insert>
<update id="update${ClassName}Dao" parameterType="${ClassName}Dao"> <update id="update${ClassName}" parameterType="${ClassName}">
update ${tableName} update ${tableName}
<trim prefix="SET" suffixOverrides=","> <trim prefix="SET" suffixOverrides=",">
#foreach($column in $columns) #foreach($column in $columns)
@ -102,11 +102,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where ${pkColumn.columnName} = #{${pkColumn.javaField}} where ${pkColumn.columnName} = #{${pkColumn.javaField}}
</update> </update>
<delete id="delete${ClassName}DaoBy${pkColumn.capJavaField}" parameterType="${pkColumn.javaType}"> <delete id="delete${ClassName}By${pkColumn.capJavaField}" parameterType="${pkColumn.javaType}">
delete from ${tableName} where ${pkColumn.columnName} = #{${pkColumn.javaField}} delete from ${tableName} where ${pkColumn.columnName} = #{${pkColumn.javaField}}
</delete> </delete>
<delete id="delete${ClassName}DaoBy${pkColumn.capJavaField}s" parameterType="String"> <delete id="delete${ClassName}By${pkColumn.capJavaField}s" parameterType="String">
delete from ${tableName} where ${pkColumn.columnName} in delete from ${tableName} where ${pkColumn.columnName} in
<foreach item="${pkColumn.javaField}" collection="array" open="(" separator="," close=")"> <foreach item="${pkColumn.javaField}" collection="array" open="(" separator="," close=")">
#{${pkColumn.javaField}} #{${pkColumn.javaField}}

40
lzbi-module/src/main/java/com/lzbi/common/SelectOptionsControl.java

@ -11,7 +11,9 @@ import com.lzbi.common.core.domain.entity.SysDept;
import com.lzbi.special.domain.DcBaseWorkSpecial; import com.lzbi.special.domain.DcBaseWorkSpecial;
import com.lzbi.special.service.DcBaseWorkSpecialService; import com.lzbi.special.service.DcBaseWorkSpecialService;
import com.lzbi.system.service.impl.SysDeptServiceImpl; import com.lzbi.system.service.impl.SysDeptServiceImpl;
import io.swagger.annotations.ApiModel; import com.lzbi.targetFolder.domain.DcBaseAssetTargetDao;
import com.lzbi.targetFolder.service.DcBaseAssetTargetService;
import io.swagger.annotations.*;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.lang.Nullable; import org.springframework.lang.Nullable;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@ -23,7 +25,7 @@ import java.util.List;
* @date 2023/12/5 * @date 2023/12/5
* SelectOptionsControl * SelectOptionsControl
*/ */
@ApiModel("通用选择接口") @Api("公用下拉列表接口")
@RestController @RestController
@RequestMapping("/tool") @RequestMapping("/tool")
public class SelectOptionsControl extends BaseController { public class SelectOptionsControl extends BaseController {
@ -35,7 +37,13 @@ public class SelectOptionsControl extends BaseController {
IDcBaseAssetInfoService dcBaseAssetInfoService; IDcBaseAssetInfoService dcBaseAssetInfoService;
@Autowired @Autowired
DcBusiParamSourceService dcBusiParamSourceService; DcBusiParamSourceService dcBusiParamSourceService;
@Autowired
private DcBaseAssetTargetService dcBaseAssetTargetService;
///获取部门类型为公司的列表,树形选择 ///获取部门类型为公司的列表,树形选择
@ApiOperation("获取公司选择树形列表")
@ApiImplicitParams({
@ApiImplicitParam(name = "depId", value = "上级部门编码默认0", dataType = "Long", dataTypeClass = Long.class),
})
@GetMapping("/company/tree/{depId}") @GetMapping("/company/tree/{depId}")
public AjaxResult getCompanyTreeList(@Nullable @PathVariable Long depId){ public AjaxResult getCompanyTreeList(@Nullable @PathVariable Long depId){
if(depId==0){ if(depId==0){
@ -46,6 +54,10 @@ public class SelectOptionsControl extends BaseController {
return AjaxResult.success( treeSelects) ; return AjaxResult.success( treeSelects) ;
} }
//普通列表 //普通列表
@ApiOperation("获取公司选择普通列表")
@ApiImplicitParams({
@ApiImplicitParam(name = "depId", value = "上级部门编码默认0", dataType = "Long", dataTypeClass = Long.class),
})
@GetMapping("/company/list/{depId}") @GetMapping("/company/list/{depId}")
public AjaxResult getCompanyList(@Nullable @PathVariable Long depId){ public AjaxResult getCompanyList(@Nullable @PathVariable Long depId){
if(depId==0){ if(depId==0){
@ -54,6 +66,10 @@ public class SelectOptionsControl extends BaseController {
return AjaxResult.success(sysDeptService.selectCompany(depId)) ; return AjaxResult.success(sysDeptService.selectCompany(depId)) ;
} }
///获取部门类型为组织的列表 ///获取部门类型为组织的列表
@ApiOperation("获取部门选择普通列表")
@ApiImplicitParams({
@ApiImplicitParam(name = "depId", value = "上级部门编码默认0", dataType = "Long", dataTypeClass = Long.class),
})
@GetMapping("/org/list/{depId}") @GetMapping("/org/list/{depId}")
public AjaxResult getOrgList(@Nullable @PathVariable Long depId){ public AjaxResult getOrgList(@Nullable @PathVariable Long depId){
if(depId==0){ if(depId==0){
@ -61,7 +77,10 @@ public class SelectOptionsControl extends BaseController {
} }
return AjaxResult.success(sysDeptService.selectOrg(depId)) ; return AjaxResult.success(sysDeptService.selectOrg(depId)) ;
} }
///获取部门类型为组织的树形选择 @ApiOperation("获取公司选选择树形列表")
@ApiImplicitParams({
@ApiImplicitParam(name = "depId", value = "上级部门编码默认0", dataType = "Long", dataTypeClass = Long.class),
})
@GetMapping("/org/tree/{depId}") @GetMapping("/org/tree/{depId}")
public AjaxResult getOrgTreeList(@Nullable @PathVariable Long depId){ public AjaxResult getOrgTreeList(@Nullable @PathVariable Long depId){
if(depId==0){ if(depId==0){
@ -70,7 +89,8 @@ public class SelectOptionsControl extends BaseController {
List<SysDept> lsysDept = sysDeptService.selectOrg(depId); List<SysDept> lsysDept = sysDeptService.selectOrg(depId);
return AjaxResult.success(sysDeptService.buildDeptTreeSelect(lsysDept)) ; return AjaxResult.success(sysDeptService.buildDeptTreeSelect(lsysDept)) ;
} }
//获取生产专业的列表 //
@ApiOperation("获取生产专业的列表")
@GetMapping("/special/list") @GetMapping("/special/list")
public AjaxResult getSepcialSelectList() public AjaxResult getSepcialSelectList()
{ {
@ -78,6 +98,7 @@ public class SelectOptionsControl extends BaseController {
return AjaxResult.success( dcBaseWorkSpecialService.selectDcBaseWorkSpecialDictList(dcBaseWorkSpecialDao)); return AjaxResult.success( dcBaseWorkSpecialService.selectDcBaseWorkSpecialDictList(dcBaseWorkSpecialDao));
} }
//根据条件获取统计单元列表 //根据条件获取统计单元列表
@ApiOperation("获取统计单元列表")
@PostMapping("/assetInfo/list") @PostMapping("/assetInfo/list")
public AjaxResult getAssetSelectList(@RequestBody AssetQueryParams assetQueryParams) public AjaxResult getAssetSelectList(@RequestBody AssetQueryParams assetQueryParams)
{ {
@ -88,14 +109,23 @@ public class SelectOptionsControl extends BaseController {
return AjaxResult.success(dcBaseAssetInfoService.selectDcBaseAssetInfoList(dcBaseAssetInfo)); return AjaxResult.success(dcBaseAssetInfoService.selectDcBaseAssetInfoList(dcBaseAssetInfo));
} }
//根据条件获取统计单元指标列表 //根据条件获取统计单元指标列表
@ApiOperation("获取统计单元指标列表")
@PostMapping("/assetTaget/list") @PostMapping("/assetTaget/list")
public AjaxResult getAssetTargetSelectList(@RequestBody AssetQueryParams assetQueryParams) public AjaxResult getAssetTargetSelectList(@RequestBody AssetQueryParams assetQueryParams)
{ {
DcBaseAssetTargetDao dcBaseAssetTargetDao=new DcBaseAssetTargetDao();
dcBaseAssetTargetDao.setAssetCode(assetQueryParams.getAssetCode());
dcBaseAssetTargetDao.setAssetId(assetQueryParams.getAssetId());
dcBaseAssetTargetService.selectDcBaseAssetTargetDaoList(dcBaseAssetTargetDao);
return AjaxResult.success(null); return AjaxResult.success(null);
} }
// //
//获取IOT参数列表 //获取IOT参数列表
//fcode 惨胡
@ApiOperation("获取采集参数列表")
@ApiImplicitParams({
@ApiImplicitParam(name = "fcode", value = "生产专业编码", dataType = "String", dataTypeClass = String.class),
})
@GetMapping("/iotParam/list/{fcode}") @GetMapping("/iotParam/list/{fcode}")
public AjaxResult getAssetIotParamList(@PathVariable String fcode) public AjaxResult getAssetIotParamList(@PathVariable String fcode)
{ {

26
lzbi-module/src/main/java/com/lzbi/draft/controller/DcBusiTargetDraftDayController.java

@ -16,7 +16,7 @@ import com.lzbi.common.annotation.Log;
import com.lzbi.common.core.controller.BaseController; import com.lzbi.common.core.controller.BaseController;
import com.lzbi.common.core.domain.AjaxResult; import com.lzbi.common.core.domain.AjaxResult;
import com.lzbi.common.enums.BusinessType; import com.lzbi.common.enums.BusinessType;
import com.lzbi.draft.domain.DcBusiTargetDraftDayDao; import com.lzbi.draft.domain.DcBusiTargetDraftDay;
import com.lzbi.draft.service.DcBusiTargetDraftDayService; import com.lzbi.draft.service.DcBusiTargetDraftDayService;
import com.lzbi.common.utils.poi.ExcelUtil; import com.lzbi.common.utils.poi.ExcelUtil;
import com.lzbi.common.core.page.TableDataInfo; import com.lzbi.common.core.page.TableDataInfo;
@ -28,7 +28,7 @@ import com.lzbi.common.core.page.TableDataInfo;
* @date 2023-11-28 * @date 2023-11-28
*/ */
@RestController @RestController
@RequestMapping("/asset/targetDay") @RequestMapping("/draft/targetDayDraft")
public class DcBusiTargetDraftDayController extends BaseController public class DcBusiTargetDraftDayController extends BaseController
{ {
@Autowired @Autowired
@ -39,10 +39,10 @@ public class DcBusiTargetDraftDayController extends BaseController
*/ */
@PreAuthorize("@ss.hasPermi('target:targetDay:list')") @PreAuthorize("@ss.hasPermi('target:targetDay:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(DcBusiTargetDraftDayDao dcBusiTargetDraftDayDao) public TableDataInfo list(DcBusiTargetDraftDay dcBusiTargetDraftDay)
{ {
startPage(); startPage();
List<DcBusiTargetDraftDayDao> list = dcBusiTargetDraftDayService.selectDcBusiTargetDraftDayDaoList(dcBusiTargetDraftDayDao); List<DcBusiTargetDraftDay> list = dcBusiTargetDraftDayService.selectDcBusiTargetDraftDayList(dcBusiTargetDraftDay);
return getDataTable(list); return getDataTable(list);
} }
@ -52,10 +52,10 @@ public class DcBusiTargetDraftDayController extends BaseController
@PreAuthorize("@ss.hasPermi('target:targetDay:export')") @PreAuthorize("@ss.hasPermi('target:targetDay:export')")
@Log(title = "指标数据底稿(日)", businessType = BusinessType.EXPORT) @Log(title = "指标数据底稿(日)", businessType = BusinessType.EXPORT)
@PostMapping("/export") @PostMapping("/export")
public void export(HttpServletResponse response, DcBusiTargetDraftDayDao dcBusiTargetDraftDayDao) public void export(HttpServletResponse response, DcBusiTargetDraftDay dcBusiTargetDraftDay)
{ {
List<DcBusiTargetDraftDayDao> list = dcBusiTargetDraftDayService.selectDcBusiTargetDraftDayDaoList(dcBusiTargetDraftDayDao); List<DcBusiTargetDraftDay> list = dcBusiTargetDraftDayService.selectDcBusiTargetDraftDayList(dcBusiTargetDraftDay);
ExcelUtil<DcBusiTargetDraftDayDao> util = new ExcelUtil<DcBusiTargetDraftDayDao>(DcBusiTargetDraftDayDao.class); ExcelUtil<DcBusiTargetDraftDay> util = new ExcelUtil<DcBusiTargetDraftDay>(DcBusiTargetDraftDay.class);
util.exportExcel(response, list, "指标数据底稿(日)数据"); util.exportExcel(response, list, "指标数据底稿(日)数据");
} }
@ -66,7 +66,7 @@ public class DcBusiTargetDraftDayController extends BaseController
@GetMapping(value = "/{id}") @GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) public AjaxResult getInfo(@PathVariable("id") Long id)
{ {
return success(dcBusiTargetDraftDayService.selectDcBusiTargetDraftDayDaoById(id)); return success(dcBusiTargetDraftDayService.selectDcBusiTargetDraftDayById(id));
} }
/** /**
@ -75,9 +75,9 @@ public class DcBusiTargetDraftDayController extends BaseController
@PreAuthorize("@ss.hasPermi('target:targetDay:add')") @PreAuthorize("@ss.hasPermi('target:targetDay:add')")
@Log(title = "指标数据底稿(日)", businessType = BusinessType.INSERT) @Log(title = "指标数据底稿(日)", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody DcBusiTargetDraftDayDao dcBusiTargetDraftDayDao) public AjaxResult add(@RequestBody DcBusiTargetDraftDay dcBusiTargetDraftDay)
{ {
return toAjax(dcBusiTargetDraftDayService.insertDcBusiTargetDraftDayDao(dcBusiTargetDraftDayDao)); return toAjax(dcBusiTargetDraftDayService.insertDcBusiTargetDraftDay(dcBusiTargetDraftDay));
} }
/** /**
@ -86,9 +86,9 @@ public class DcBusiTargetDraftDayController extends BaseController
@PreAuthorize("@ss.hasPermi('target:targetDay:edit')") @PreAuthorize("@ss.hasPermi('target:targetDay:edit')")
@Log(title = "指标数据底稿(日)", businessType = BusinessType.UPDATE) @Log(title = "指标数据底稿(日)", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody DcBusiTargetDraftDayDao dcBusiTargetDraftDayDao) public AjaxResult edit(@RequestBody DcBusiTargetDraftDay dcBusiTargetDraftDay)
{ {
return toAjax(dcBusiTargetDraftDayService.updateDcBusiTargetDraftDayDao(dcBusiTargetDraftDayDao)); return toAjax(dcBusiTargetDraftDayService.updateDcBusiTargetDraftDay(dcBusiTargetDraftDay));
} }
/** /**
@ -99,6 +99,6 @@ public class DcBusiTargetDraftDayController extends BaseController
@DeleteMapping("/{ids}") @DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) public AjaxResult remove(@PathVariable Long[] ids)
{ {
return toAjax(dcBusiTargetDraftDayService.deleteDcBusiTargetDraftDayDaoByIds(ids)); return toAjax(dcBusiTargetDraftDayService.deleteDcBusiTargetDraftDayByIds(ids));
} }
} }

11
lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiTargetDraftDayDao.java → lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiTargetDraftDay.java

@ -1,11 +1,8 @@
package com.lzbi.draft.domain; package com.lzbi.draft.domain;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.lzbi.common.annotation.Excel; import com.lzbi.common.annotation.Excel;
import com.lzbi.module.base.BaseModuleEntity; import com.lzbi.module.base.BaseModuleEntity;
@ -16,7 +13,7 @@ import com.lzbi.module.base.BaseModuleEntity;
* @date 2023-11-28 * @date 2023-11-28
*/ */
@Data @Data
public class DcBusiTargetDraftDayDao extends BaseModuleEntity public class DcBusiTargetDraftDay extends BaseModuleEntity
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ -29,11 +26,11 @@ public class DcBusiTargetDraftDayDao extends BaseModuleEntity
/** 公司编码 */ /** 公司编码 */
@Excel(name = "公司编码") @Excel(name = "公司编码")
private String companyCode; private Long companyId;
/** 组织机构代码 */ /** 组织机构代码 */
@Excel(name = "组织机构代码") @Excel(name = "组织机构代码")
private String orgCode; private Long orgId;
/** 组织机构名称 */ /** 组织机构名称 */
@Excel(name = "组织机构名称") @Excel(name = "组织机构名称")

21
lzbi-module/src/main/java/com/lzbi/draft/mapper/DcBusiTargetDraftDayMapper.java

@ -2,8 +2,7 @@ package com.lzbi.draft.mapper;
import java.util.List; import java.util.List;
import com.lzbi.draft.domain.DcBusiTargetAdjustDaySubDao; import com.lzbi.draft.domain.DcBusiTargetDraftDay;
import com.lzbi.draft.domain.DcBusiTargetDraftDayDao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/** /**
@ -13,7 +12,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* @date 2023-11-28 * @date 2023-11-28
*/ */
public interface DcBusiTargetDraftDayMapper extends BaseMapper<DcBusiTargetDraftDayDao> public interface DcBusiTargetDraftDayMapper extends BaseMapper<DcBusiTargetDraftDay>
{ {
/** /**
* 查询指标数据底稿() * 查询指标数据底稿()
@ -21,23 +20,23 @@ public interface DcBusiTargetDraftDayMapper extends BaseMapper<DcBusiTargetDraft
* @param id 指标数据底稿()主键 * @param id 指标数据底稿()主键
* @return 指标数据底稿() * @return 指标数据底稿()
*/ */
public DcBusiTargetDraftDayDao selectDcBusiTargetDraftDayDaoById(Long id); public DcBusiTargetDraftDay selectDcBusiTargetDraftDayById(Long id);
/** /**
* 查询指标数据底稿()列表 * 查询指标数据底稿()列表
* *
* @param dcBusiTargetDraftDayDao 指标数据底稿() * @param dcBusiTargetDraftDay 指标数据底稿()
* @return 指标数据底稿()集合 * @return 指标数据底稿()集合
*/ */
public List<DcBusiTargetDraftDayDao> selectDcBusiTargetDraftDayDaoList(DcBusiTargetDraftDayDao dcBusiTargetDraftDayDao); public List<DcBusiTargetDraftDay> selectDcBusiTargetDraftDayList(DcBusiTargetDraftDay dcBusiTargetDraftDay);
/** /**
* 新增指标数据底稿() * 新增指标数据底稿()
* *
* @param dcBusiTargetDraftDayDao 指标数据底稿() * @param dcBusiTargetDraftDay 指标数据底稿()
* @return 结果 * @return 结果
*/ */
public int insertDcBusiTargetDraftDayDao(DcBusiTargetDraftDayDao dcBusiTargetDraftDayDao); public int insertDcBusiTargetDraftDay(DcBusiTargetDraftDay dcBusiTargetDraftDay);
/** /**
* 修改指标数据底稿() * 修改指标数据底稿()
@ -45,7 +44,7 @@ public interface DcBusiTargetDraftDayMapper extends BaseMapper<DcBusiTargetDraft
* @param dcBusiTargetDraftDay 指标数据底稿() * @param dcBusiTargetDraftDay 指标数据底稿()
* @return 结果 * @return 结果
*/ */
public int updateDcBusiTargetDraftDayDao(DcBusiTargetDraftDayDao dcBusiTargetDraftDayDao); public int updateDcBusiTargetDraftDay(DcBusiTargetDraftDay dcBusiTargetDraftDay);
/** /**
* 删除指标数据底稿() * 删除指标数据底稿()
@ -53,7 +52,7 @@ public interface DcBusiTargetDraftDayMapper extends BaseMapper<DcBusiTargetDraft
* @param id 指标数据底稿()主键 * @param id 指标数据底稿()主键
* @return 结果 * @return 结果
*/ */
public int deleteDcBusiTargetDraftDayDaoById(Long id); public int deleteDcBusiTargetDraftDayById(Long id);
/** /**
* 批量删除指标数据底稿() * 批量删除指标数据底稿()
@ -61,5 +60,5 @@ public interface DcBusiTargetDraftDayMapper extends BaseMapper<DcBusiTargetDraft
* @param ids 需要删除的数据主键集合 * @param ids 需要删除的数据主键集合
* @return 结果 * @return 结果
*/ */
public int deleteDcBusiTargetDraftDayDaoByIds(Long[] ids); public int deleteDcBusiTargetDraftDayByIds(Long[] ids);
} }

38
lzbi-module/src/main/java/com/lzbi/draft/service/DcBusiTargetDraftDayService.java

@ -2,7 +2,7 @@ package com.lzbi.draft.service;
import java.util.List; import java.util.List;
import com.lzbi.draft.domain.DcBusiTargetDraftDayDao; import com.lzbi.draft.domain.DcBusiTargetDraftDay;
import com.lzbi.common.utils.DateUtils; import com.lzbi.common.utils.DateUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.lzbi.draft.mapper.DcBusiTargetDraftDayMapper; import com.lzbi.draft.mapper.DcBusiTargetDraftDayMapper;
@ -15,7 +15,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
* @date 2023-11-28 * @date 2023-11-28
*/ */
@Service @Service
public class DcBusiTargetDraftDayService extends ServiceImpl<DcBusiTargetDraftDayMapper, DcBusiTargetDraftDayDao> implements IService<DcBusiTargetDraftDayDao> public class DcBusiTargetDraftDayService extends ServiceImpl<DcBusiTargetDraftDayMapper, DcBusiTargetDraftDay> implements IService<DcBusiTargetDraftDay>
{ {
/** /**
@ -24,46 +24,46 @@ public class DcBusiTargetDraftDayService extends ServiceImpl<DcBusiTargetDraftDa
* @param id 指标数据底稿()主键 * @param id 指标数据底稿()主键
* @return 指标数据底稿() * @return 指标数据底稿()
*/ */
public DcBusiTargetDraftDayDao selectDcBusiTargetDraftDayDaoById(Long id) public DcBusiTargetDraftDay selectDcBusiTargetDraftDayById(Long id)
{ {
return baseMapper.selectDcBusiTargetDraftDayDaoById(id); return baseMapper.selectDcBusiTargetDraftDayById(id);
} }
/** /**
* 查询指标数据底稿()列表 * 查询指标数据底稿()列表
* *
* @param dcBusiTargetDraftDayDao 指标数据底稿() * @param dcBusiTargetDraftDay 指标数据底稿()
* @return 指标数据底稿() * @return 指标数据底稿()
*/ */
public List<DcBusiTargetDraftDayDao> selectDcBusiTargetDraftDayDaoList(DcBusiTargetDraftDayDao dcBusiTargetDraftDayDao) public List<DcBusiTargetDraftDay> selectDcBusiTargetDraftDayList(DcBusiTargetDraftDay dcBusiTargetDraftDay)
{ {
return baseMapper.selectDcBusiTargetDraftDayDaoList(dcBusiTargetDraftDayDao); return baseMapper.selectDcBusiTargetDraftDayList(dcBusiTargetDraftDay);
} }
/** /**
* 新增指标数据底稿() * 新增指标数据底稿()
* *
* @param dcBusiTargetDraftDayDao 指标数据底稿() * @param dcBusiTargetDraftDay 指标数据底稿()
* @return 结果 * @return 结果
*/ */
public int insertDcBusiTargetDraftDayDao(DcBusiTargetDraftDayDao dcBusiTargetDraftDayDao) public int insertDcBusiTargetDraftDay(DcBusiTargetDraftDay dcBusiTargetDraftDay)
{ {
dcBusiTargetDraftDayDao.setCreatedTime(DateUtils.getNowDate()); dcBusiTargetDraftDay.setCreatedTime(DateUtils.getNowDate());
return baseMapper.insertDcBusiTargetDraftDayDao(dcBusiTargetDraftDayDao); return baseMapper.insertDcBusiTargetDraftDay(dcBusiTargetDraftDay);
} }
/** /**
* 修改指标数据底稿() * 修改指标数据底稿()
* *
* @param dcBusiTargetDraftDayDao 指标数据底稿() * @param dcBusiTargetDraftDay 指标数据底稿()
* @return 结果 * @return 结果
*/ */
public int updateDcBusiTargetDraftDayDao(DcBusiTargetDraftDayDao dcBusiTargetDraftDayDao) public int updateDcBusiTargetDraftDay(DcBusiTargetDraftDay dcBusiTargetDraftDay)
{ {
dcBusiTargetDraftDayDao.setUpdatedTime(DateUtils.getNowDate()); dcBusiTargetDraftDay.setUpdatedTime(DateUtils.getNowDate());
return baseMapper.updateDcBusiTargetDraftDayDao(dcBusiTargetDraftDayDao); return baseMapper.updateDcBusiTargetDraftDay(dcBusiTargetDraftDay);
} }
/** /**
@ -73,9 +73,9 @@ public class DcBusiTargetDraftDayService extends ServiceImpl<DcBusiTargetDraftDa
* @return 结果 * @return 结果
*/ */
public int deleteDcBusiTargetDraftDayDaoByIds(Long[] ids) public int deleteDcBusiTargetDraftDayByIds(Long[] ids)
{ {
return baseMapper.deleteDcBusiTargetDraftDayDaoByIds(ids); return baseMapper.deleteDcBusiTargetDraftDayByIds(ids);
} }
/** /**
@ -85,8 +85,8 @@ public class DcBusiTargetDraftDayService extends ServiceImpl<DcBusiTargetDraftDa
* @return 结果 * @return 结果
*/ */
public int deleteDcBusiTargetDraftDayDaoById(Long id) public int deleteDcBusiTargetDraftDayById(Long id)
{ {
return baseMapper.deleteDcBusiTargetDraftDayDaoById(id); return baseMapper.deleteDcBusiTargetDraftDayById(id);
} }
} }

130
lzbi-module/src/main/resources/mapper/asset/DcBusiTargetDraftDayMapper.xml

@ -4,23 +4,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.lzbi.draft.mapper.DcBusiTargetDraftDayMapper"> <mapper namespace="com.lzbi.draft.mapper.DcBusiTargetDraftDayMapper">
<resultMap type="com.lzbi.draft.domain.DcBusiTargetDraftDayDao" id="DcBusiTargetDraftDayDaoResult"> <resultMap type="com.lzbi.draft.domain.DcBusiTargetDraftDay" id="DcBusiTargetDraftDayResult">
<result property="tenantId" column="TENANT_ID" />
<result property="REVISION" column="REVISION" />
<result property="createdBy" column="CREATED_BY" />
<result property="createdTime" column="CREATED_TIME" />
<result property="updatedBy" column="UPDATED_BY" />
<result property="updatedTime" column="UPDATED_TIME" />
<result property="deleteBy" column="DELETE_BY" />
<result property="deleteTime" column="DELETE_TIME" />
<result property="id" column="id" /> <result property="id" column="id" />
<result property="companyName" column="company_name" /> <result property="companyName" column="company_name" />
<result property="companyCode" column="company_code" /> <result property="companyId" column="company_id" />
<result property="orgCode" column="org_code" /> <result property="orgId" column="org_id" />
<result property="orgName" column="org_name" /> <result property="orgName" column="org_name" />
<result property="assetCode" column="asset_code" /> <result property="assetCode" column="asset_code" />
<result property="assetName" column="asset_name" /> <result property="assetName" column="asset_name" />
<result property="fieldType" column="field_type" /> <result property="fieldCode" column="field_code" />
<result property="fieldName" column="field_name" />
<result property="targetNameAlias" column="target_name_alias" />
<result property="targetName" column="target_name" /> <result property="targetName" column="target_name" />
<result property="targetCode" column="target_code" /> <result property="targetCode" column="target_code" />
<result property="targetUint" column="target_uint" /> <result property="targetUint" column="target_uint" />
@ -28,57 +22,50 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="valOriginal" column="val_original" /> <result property="valOriginal" column="val_original" />
<result property="valAdjust" column="val_adjust" /> <result property="valAdjust" column="val_adjust" />
<result property="valResult" column="val_result" /> <result property="valResult" column="val_result" />
<result property="valPlan" column="val_plan" /> <result property="tenantId" column="tenant_id" />
<result property="revision" column="revision" />
<result property="createdBy" column="created_by" />
<result property="createdTime" column="created_time" />
<result property="updatedBy" column="updated_by" />
<result property="updatedTime" column="updated_time" />
<result property="deleteBy" column="delete_by" />
<result property="deleteTime" column="delete_time" />
</resultMap> </resultMap>
<sql id="selectDcBusiTargetDraftDayVo"> <sql id="selectDcBusiTargetDraftDayVo">
select TENANT_ID, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME, DELETE_BY, DELETE_TIME, id, company_name, company_code, org_code, org_name, asset_code, asset_name, field_type, target_name, target_code, target_uint, count_date, val_original, val_adjust, val_result, val_plan from dc_busi_target_draft_day select id, company_name, company_id, org_id, org_name, asset_code, asset_name, field_code, field_name, target_name_alias, target_name, target_code, target_uint, count_date, val_original, val_adjust, val_result, tenant_id, revision, created_by, created_time, updated_by, updated_time, delete_by, delete_time from dc_busi_target_draft_day
</sql> </sql>
<select id="selectDcBusiTargetDraftDayDaoList" parameterType="DcBusiTargetDraftDayDao" resultMap="DcBusiTargetDraftDayDaoResult"> <select id="selectDcBusiTargetDraftDayList" parameterType="DcBusiTargetDraftDay" resultMap="DcBusiTargetDraftDayResult">
<include refid="selectDcBusiTargetDraftDayVo"/> <include refid="selectDcBusiTargetDraftDayVo"/>
<where> <where>
<if test="companyName != null and companyName != ''"> and company_name like concat('%', #{companyName}, '%')</if> <if test="companyId != null "> and company_id = #{companyId}</if>
<if test="companyCode != null and companyCode != ''"> and company_code = #{companyCode}</if> <if test="orgId != null "> and org_id = #{orgId}</if>
<if test="orgCode != null and orgCode != ''"> and org_code = #{orgCode}</if>
<if test="orgName != null and orgName != ''"> and org_name like concat('%', #{orgName}, '%')</if>
<if test="assetCode != null and assetCode != ''"> and asset_code = #{assetCode}</if> <if test="assetCode != null and assetCode != ''"> and asset_code = #{assetCode}</if>
<if test="assetName != null and assetName != ''"> and asset_name like concat('%', #{assetName}, '%')</if> <if test="fieldCode != null and fieldCode != ''"> and field_code = #{fieldCode}</if>
<if test="fieldType != null and fieldType != ''"> and field_type = #{fieldType}</if>
<if test="targetName != null and targetName != ''"> and target_name like concat('%', #{targetName}, '%')</if> <if test="targetName != null and targetName != ''"> and target_name like concat('%', #{targetName}, '%')</if>
<if test="targetCode != null and targetCode != ''"> and target_code = #{targetCode}</if> <if test="targetCode != null and targetCode != ''"> and target_code = #{targetCode}</if>
<if test="targetUint != null and targetUint != ''"> and target_uint = #{targetUint}</if>
<if test="countDate != null and countDate != ''"> and count_date = #{countDate}</if> <if test="countDate != null and countDate != ''"> and count_date = #{countDate}</if>
<if test="valOriginal != null "> and val_original = #{valOriginal}</if>
<if test="valAdjust != null "> and val_adjust = #{valAdjust}</if>
<if test="valResult != null "> and val_result = #{valResult}</if>
<if test="valPlan != null and valPlan != ''"> and val_plan = #{valPlan}</if>
</where> </where>
</select> </select>
<select id="selectDcBusiTargetDraftDayDaoById" parameterType="Long" resultMap="DcBusiTargetDraftDayDaoResult"> <select id="selectDcBusiTargetDraftDayById" parameterType="Long" resultMap="DcBusiTargetDraftDayResult">
<include refid="selectDcBusiTargetDraftDayVo"/> <include refid="selectDcBusiTargetDraftDayVo"/>
where id = #{id} where id = #{id}
</select> </select>
<insert id="insertDcBusiTargetDraftDayDao" parameterType="DcBusiTargetDraftDayDao" useGeneratedKeys="true" keyProperty="id"> <insert id="insertDcBusiTargetDraftDay" parameterType="DcBusiTargetDraftDay" useGeneratedKeys="true" keyProperty="id">
insert into dc_busi_target_draft_day insert into dc_busi_target_draft_day
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
<if test="tenantId != null">TENANT_ID,</if>
<if test="REVISION != null">REVISION,</if>
<if test="createdBy != null">CREATED_BY,</if>
<if test="createdTime != null">CREATED_TIME,</if>
<if test="updatedBy != null">UPDATED_BY,</if>
<if test="updatedTime != null">UPDATED_TIME,</if>
<if test="deleteBy != null">DELETE_BY,</if>
<if test="deleteTime != null">DELETE_TIME,</if>
<if test="companyName != null">company_name,</if> <if test="companyName != null">company_name,</if>
<if test="companyCode != null">company_code,</if> <if test="companyId != null">company_id,</if>
<if test="orgCode != null">org_code,</if> <if test="orgId != null">org_id,</if>
<if test="orgName != null">org_name,</if> <if test="orgName != null">org_name,</if>
<if test="assetCode != null">asset_code,</if> <if test="assetCode != null">asset_code,</if>
<if test="assetName != null">asset_name,</if> <if test="assetName != null">asset_name,</if>
<if test="fieldType != null">field_type,</if> <if test="fieldCode != null">field_code,</if>
<if test="fieldName != null">field_name,</if>
<if test="targetNameAlias != null">target_name_alias,</if>
<if test="targetName != null">target_name,</if> <if test="targetName != null">target_name,</if>
<if test="targetCode != null">target_code,</if> <if test="targetCode != null">target_code,</if>
<if test="targetUint != null">target_uint,</if> <if test="targetUint != null">target_uint,</if>
@ -86,24 +73,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="valOriginal != null">val_original,</if> <if test="valOriginal != null">val_original,</if>
<if test="valAdjust != null">val_adjust,</if> <if test="valAdjust != null">val_adjust,</if>
<if test="valResult != null">val_result,</if> <if test="valResult != null">val_result,</if>
<if test="valPlan != null">val_plan,</if> <if test="tenantId != null">tenant_id,</if>
<if test="revision != null">revision,</if>
<if test="createdBy != null">created_by,</if>
<if test="createdTime != null">created_time,</if>
<if test="updatedBy != null">updated_by,</if>
<if test="updatedTime != null">updated_time,</if>
<if test="deleteBy != null">delete_by,</if>
<if test="deleteTime != null">delete_time,</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="tenantId != null">#{tenantId},</if>
<if test="REVISION != null">#{REVISION},</if>
<if test="createdBy != null">#{createdBy},</if>
<if test="createdTime != null">#{createdTime},</if>
<if test="updatedBy != null">#{updatedBy},</if>
<if test="updatedTime != null">#{updatedTime},</if>
<if test="deleteBy != null">#{deleteBy},</if>
<if test="deleteTime != null">#{deleteTime},</if>
<if test="companyName != null">#{companyName},</if> <if test="companyName != null">#{companyName},</if>
<if test="companyCode != null">#{companyCode},</if> <if test="companyId != null">#{companyId},</if>
<if test="orgCode != null">#{orgCode},</if> <if test="orgId != null">#{orgId},</if>
<if test="orgName != null">#{orgName},</if> <if test="orgName != null">#{orgName},</if>
<if test="assetCode != null">#{assetCode},</if> <if test="assetCode != null">#{assetCode},</if>
<if test="assetName != null">#{assetName},</if> <if test="assetName != null">#{assetName},</if>
<if test="fieldType != null">#{fieldType},</if> <if test="fieldCode != null">#{fieldCode},</if>
<if test="fieldName != null">#{fieldName},</if>
<if test="targetNameAlias != null">#{targetNameAlias},</if>
<if test="targetName != null">#{targetName},</if> <if test="targetName != null">#{targetName},</if>
<if test="targetCode != null">#{targetCode},</if> <if test="targetCode != null">#{targetCode},</if>
<if test="targetUint != null">#{targetUint},</if> <if test="targetUint != null">#{targetUint},</if>
@ -111,28 +99,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="valOriginal != null">#{valOriginal},</if> <if test="valOriginal != null">#{valOriginal},</if>
<if test="valAdjust != null">#{valAdjust},</if> <if test="valAdjust != null">#{valAdjust},</if>
<if test="valResult != null">#{valResult},</if> <if test="valResult != null">#{valResult},</if>
<if test="valPlan != null">#{valPlan},</if> <if test="tenantId != null">#{tenantId},</if>
<if test="revision != null">#{revision},</if>
<if test="createdBy != null">#{createdBy},</if>
<if test="createdTime != null">#{createdTime},</if>
<if test="updatedBy != null">#{updatedBy},</if>
<if test="updatedTime != null">#{updatedTime},</if>
<if test="deleteBy != null">#{deleteBy},</if>
<if test="deleteTime != null">#{deleteTime},</if>
</trim> </trim>
</insert> </insert>
<update id="updateDcBusiTargetDraftDayDao" parameterType="DcBusiTargetDraftDayDao"> <update id="updateDcBusiTargetDraftDay" parameterType="DcBusiTargetDraftDay">
update dc_busi_target_draft_day update dc_busi_target_draft_day
<trim prefix="SET" suffixOverrides=","> <trim prefix="SET" suffixOverrides=",">
<if test="tenantId != null">TENANT_ID = #{tenantId},</if>
<if test="REVISION != null">REVISION = #{REVISION},</if>
<if test="createdBy != null">CREATED_BY = #{createdBy},</if>
<if test="createdTime != null">CREATED_TIME = #{createdTime},</if>
<if test="updatedBy != null">UPDATED_BY = #{updatedBy},</if>
<if test="updatedTime != null">UPDATED_TIME = #{updatedTime},</if>
<if test="deleteBy != null">DELETE_BY = #{deleteBy},</if>
<if test="deleteTime != null">DELETE_TIME = #{deleteTime},</if>
<if test="companyName != null">company_name = #{companyName},</if> <if test="companyName != null">company_name = #{companyName},</if>
<if test="companyCode != null">company_code = #{companyCode},</if> <if test="companyId != null">company_id = #{companyId},</if>
<if test="orgCode != null">org_code = #{orgCode},</if> <if test="orgId != null">org_id = #{orgId},</if>
<if test="orgName != null">org_name = #{orgName},</if> <if test="orgName != null">org_name = #{orgName},</if>
<if test="assetCode != null">asset_code = #{assetCode},</if> <if test="assetCode != null">asset_code = #{assetCode},</if>
<if test="assetName != null">asset_name = #{assetName},</if> <if test="assetName != null">asset_name = #{assetName},</if>
<if test="fieldType != null">field_type = #{fieldType},</if> <if test="fieldCode != null">field_code = #{fieldCode},</if>
<if test="fieldName != null">field_name = #{fieldName},</if>
<if test="targetNameAlias != null">target_name_alias = #{targetNameAlias},</if>
<if test="targetName != null">target_name = #{targetName},</if> <if test="targetName != null">target_name = #{targetName},</if>
<if test="targetCode != null">target_code = #{targetCode},</if> <if test="targetCode != null">target_code = #{targetCode},</if>
<if test="targetUint != null">target_uint = #{targetUint},</if> <if test="targetUint != null">target_uint = #{targetUint},</if>
@ -140,16 +129,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="valOriginal != null">val_original = #{valOriginal},</if> <if test="valOriginal != null">val_original = #{valOriginal},</if>
<if test="valAdjust != null">val_adjust = #{valAdjust},</if> <if test="valAdjust != null">val_adjust = #{valAdjust},</if>
<if test="valResult != null">val_result = #{valResult},</if> <if test="valResult != null">val_result = #{valResult},</if>
<if test="valPlan != null">val_plan = #{valPlan},</if> <if test="tenantId != null">tenant_id = #{tenantId},</if>
<if test="revision != null">revision = #{revision},</if>
<if test="createdBy != null">created_by = #{createdBy},</if>
<if test="createdTime != null">created_time = #{createdTime},</if>
<if test="updatedBy != null">updated_by = #{updatedBy},</if>
<if test="updatedTime != null">updated_time = #{updatedTime},</if>
<if test="deleteBy != null">delete_by = #{deleteBy},</if>
<if test="deleteTime != null">delete_time = #{deleteTime},</if>
</trim> </trim>
where id = #{id} where id = #{id}
</update> </update>
<delete id="deleteDcBusiTargetDraftDayDaoById" parameterType="Long"> <delete id="deleteDcBusiTargetDraftDayById" parameterType="Long">
delete from dc_busi_target_draft_day where id = #{id} delete from dc_busi_target_draft_day where id = #{id}
</delete> </delete>
<delete id="deleteDcBusiTargetDraftDayDaoByIds" parameterType="String"> <delete id="deleteDcBusiTargetDraftDayByIds" parameterType="String">
delete from dc_busi_target_draft_day where id in delete from dc_busi_target_draft_day where id in
<foreach item="id" collection="array" open="(" separator="," close=")"> <foreach item="id" collection="array" open="(" separator="," close=")">
#{id} #{id}

Loading…
Cancel
Save