Skip to content

A
amos-boot-biz
Commit 4ed3896e authored by tianbo's avatar tianbo
Browse files
Options

两个规定统计表相关代码提交

parent 141c0f3d
Show whitespace changes
Inline Side-by-side
Showing with 331 additions and 21 deletions
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/MyBatisPlusCodeGeneratorTzs.java
View file @ 4ed3896e
...@@ -30,18 +30,18 @@ public class MyBatisPlusCodeGeneratorTzs { ...@@ -30,18 +30,18 @@ public class MyBatisPlusCodeGeneratorTzs {
/** /**
* 拆分服务名 可根据实际拆分项目进行修改 * 拆分服务名 可根据实际拆分项目进行修改
*/ */
static String ShortName = "ymt"; static String ShortName = "tcm";
/** /**
* 项目api目录 * 项目api目录
*/ */
static String apiAddress = "/amos-boot-system-" + projectShortName + "/" + "amos-boot-module-ymt/" + static String apiAddress = "/amos-boot-system-" + projectShortName + "/" + "amos-boot-module-" + ShortName + "/" +
"amos-boot-module-" + ShortName + "-api/"; "amos-boot-module-" + ShortName + "-api/";
/** /**
* 项目biz目录 * 项目biz目录
*/ */
static String bizAddress = "/amos-boot-system-" + projectShortName + "/" + "amos-boot-module-ymt/" + static String bizAddress = "/amos-boot-system-" + projectShortName + "/" + "amos-boot-module-" + ShortName + "/" +
"amos-boot-module-" + ShortName + "-biz/"; "amos-boot-module-" + ShortName + "-biz/";
/** /**
......
amos-boot-system-tzs/amos-boot-module-app/amos-boot-module-app-biz/src/main/java/com/yeejoin/amos/boot/module/app/biz/service/impl/EquipmentCategoryServiceImpl.java
View file @ 4ed3896e
...@@ -6,16 +6,28 @@ import com.alibaba.fastjson.TypeReference; ...@@ -6,16 +6,28 @@ import com.alibaba.fastjson.TypeReference;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.google.common.collect.Lists;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams; import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.biz.common.utils.RedisKey; import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils; import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.boot.module.app.api.dto.*; import com.yeejoin.amos.boot.module.app.api.dto.ESEquipmentCategoryDto;
import com.yeejoin.amos.boot.module.app.api.entity.*; import com.yeejoin.amos.boot.module.app.api.dto.EquInfoDto;
import com.yeejoin.amos.boot.module.app.api.dto.EquipExportDto;
import com.yeejoin.amos.boot.module.app.api.dto.EquipmentCategoryDto;
import com.yeejoin.amos.boot.module.app.api.dto.UseUnitCreditCodeCategoryDto;
import com.yeejoin.amos.boot.module.app.api.entity.CategoryOtherInfo;
import com.yeejoin.amos.boot.module.app.api.entity.EquipmentCategory;
import com.yeejoin.amos.boot.module.app.api.entity.EquipmentCategoryData;
import com.yeejoin.amos.boot.module.app.api.entity.SupervisoryCodeInfo;
import com.yeejoin.amos.boot.module.app.api.entity.UseInfo;
import com.yeejoin.amos.boot.module.app.api.enums.EquimentEnum; import com.yeejoin.amos.boot.module.app.api.enums.EquimentEnum;
import com.yeejoin.amos.boot.module.app.api.enums.EquipmentCategoryEnum; import com.yeejoin.amos.boot.module.app.api.enums.EquipmentCategoryEnum;
import com.yeejoin.amos.boot.module.app.api.enums.EquipmentClassifityEnum; import com.yeejoin.amos.boot.module.app.api.enums.EquipmentClassifityEnum;
import com.yeejoin.amos.boot.module.app.api.mapper.*; import com.yeejoin.amos.boot.module.app.api.mapper.CategoryOtherInfoMapper;
import com.yeejoin.amos.boot.module.app.api.mapper.EquipmentCategoryDataMapper;
import com.yeejoin.amos.boot.module.app.api.mapper.EquipmentCategoryMapper;
import com.yeejoin.amos.boot.module.app.api.mapper.SuperviseInfoMapper;
import com.yeejoin.amos.boot.module.app.api.mapper.SupervisoryCodeInfoMapper;
import com.yeejoin.amos.boot.module.app.api.mapper.UseInfoMapper;
import com.yeejoin.amos.boot.module.app.api.service.IEquipmentCategoryService; import com.yeejoin.amos.boot.module.app.api.service.IEquipmentCategoryService;
import com.yeejoin.amos.boot.module.app.api.vo.EquipExportVo; import com.yeejoin.amos.boot.module.app.api.vo.EquipExportVo;
import com.yeejoin.amos.boot.module.app.biz.dao.ESEquipmentCategory; import com.yeejoin.amos.boot.module.app.biz.dao.ESEquipmentCategory;
...@@ -46,15 +58,23 @@ import org.springframework.util.Assert; ...@@ -46,15 +58,23 @@ import org.springframework.util.Assert;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
import org.springframework.util.StopWatch; import org.springframework.util.StopWatch;
import org.typroject.tyboot.core.foundation.context.RequestContext; import org.typroject.tyboot.core.foundation.context.RequestContext;
import org.typroject.tyboot.core.foundation.utils.DateUtil;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil; import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.rdbms.service.BaseService; import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.typroject.tyboot.core.restful.utils.ResponseModel; import org.typroject.tyboot.core.restful.utils.ResponseModel;
import java.io.IOException; import java.io.IOException;
import java.sql.Timestamp;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.*; import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.StringJoiner;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static com.alibaba.fastjson.JSON.toJSONString; import static com.alibaba.fastjson.JSON.toJSONString;
...@@ -1193,17 +1213,17 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD ...@@ -1193,17 +1213,17 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
meBuilder.must(QueryBuilders.matchQuery("EQU_STATE", test)); meBuilder.must(QueryBuilders.matchQuery("EQU_STATE", test));
boolMust.must(meBuilder); boolMust.must(meBuilder);
} }
if (!ObjectUtils.isEmpty(map.getString("STATUS"))) { // if (!ObjectUtils.isEmpty(map.getString("STATUS"))) {
BoolQueryBuilder meBuilder = QueryBuilders.boolQuery(); // BoolQueryBuilder meBuilder = QueryBuilders.boolQuery();
String test = QueryParser.escape(map.getString("STATUS")); // String test = QueryParser.escape(map.getString("STATUS"));
if (test.contains("非")) { // if (test.contains("非")) {
meBuilder.must(QueryBuilders.matchPhraseQuery("STATUS", test.replace("非", ""))); // meBuilder.must(QueryBuilders.matchPhraseQuery("STATUS", test.replace("非", "")));
boolMust.mustNot(meBuilder); // boolMust.mustNot(meBuilder);
} else { // } else {
meBuilder.must(QueryBuilders.matchPhraseQuery("STATUS", test)); // meBuilder.must(QueryBuilders.matchPhraseQuery("STATUS", test));
boolMust.must(meBuilder); // boolMust.must(meBuilder);
} // }
} // }
if (!ObjectUtils.isEmpty(map.getString("CLAIM_STATUS"))) { if (!ObjectUtils.isEmpty(map.getString("CLAIM_STATUS"))) {
BoolQueryBuilder meBuilder = QueryBuilders.boolQuery(); BoolQueryBuilder meBuilder = QueryBuilders.boolQuery();
String test = QueryParser.escape(map.getString("CLAIM_STATUS")); String test = QueryParser.escape(map.getString("CLAIM_STATUS"));
......
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/dto/TzsTwoStaffingDto.java 0 → 100644
View file @ 4ed3896e
package com.yeejoin.amos.boot.module.tcm.api.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
/**
*
*
* @author system_generator
* @date 2023-10-27
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="TzsTwoStaffingDto", description="")
public class TzsTwoStaffingDto extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "监管单位ID")
private Integer supervisoryUnitId;
@ApiModelProperty(value = "监管单位名称")
private String supervisoryUnitName;
@ApiModelProperty(value = "监管单位orgcode")
private Integer supervisoryUnitOrgcode;
@ApiModelProperty(value = "监管单位等级")
private Integer supervisoryUnitLevel;
@ApiModelProperty(value = "单位数")
private Integer numberOfUnits;
@ApiModelProperty(value = "已完成单位数")
private Integer numberOfCompletedUnits;
@ApiModelProperty(value = "完成比例")
private Integer completionRatio;
@ApiModelProperty(value = "已配备主要负责人单位数")
private Integer responsibleUnitsAllocateNumber;
@ApiModelProperty(value = "占比")
private Integer proportion;
@ApiModelProperty(value = "主要负责人数")
private Integer responsiblePersonsNumber;
@ApiModelProperty(value = "安全总监数")
private Integer safetyDirectorsNumber;
@ApiModelProperty(value = "安全员数")
private Integer safetyOfficersNumber;
@ApiModelProperty(value = "单位类型(1使用单位，2生产单位)")
private String unitType;
}
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/entity/TzsTwoStaffing.java 0 → 100644
View file @ 4ed3896e
package com.yeejoin.amos.boot.module.tcm.api.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.util.Date;
/**
*
*
* @author system_generator
* @date 2023-10-27
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("tzs_two_staffing")
public class TzsTwoStaffing extends BaseEntity {
private static final long serialVersionUID = 1L;
/**
* 监管单位ID
*/
@TableField("supervisory_unit_id")
private Integer supervisoryUnitId;
/**
* 监管单位名称
*/
@TableField("supervisory_unit_name")
private String supervisoryUnitName;
/**
* 监管单位orgcode
*/
@TableField("supervisory_unit_orgcode")
private Integer supervisoryUnitOrgcode;
/**
* 监管单位等级
*/
@TableField("supervisory_unit_level")
private Integer supervisoryUnitLevel;
/**
* 单位数
*/
@TableField("number_of_units")
private Integer numberOfUnits;
/**
* 已完成单位数
*/
@TableField("number_of_completed_units")
private Integer numberOfCompletedUnits;
/**
* 完成比例
*/
@TableField("completion_ratio")
private Integer completionRatio;
/**
* 已配备主要负责人单位数
*/
@TableField("responsible_units_allocate_number")
private Integer responsibleUnitsAllocateNumber;
/**
* 占比
*/
@TableField("proportion")
private Integer proportion;
/**
* 主要负责人数
*/
@TableField("responsible_persons_number")
private Integer responsiblePersonsNumber;
/**
* 安全总监数
*/
@TableField("safety_directors_number")
private Integer safetyDirectorsNumber;
/**
* 安全员数
*/
@TableField("safety_officers_number")
private Integer safetyOfficersNumber;
/**
* 单位类型(1使用单位，2生产单位)
*/
@TableField("unit_type")
private String unitType;
}
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/mapper/TzsTwoStaffingMapper.java 0 → 100644
View file @ 4ed3896e
package com.yeejoin.amos.boot.module.tcm.api.mapper;
import com.yeejoin.amos.boot.module.tcm.api.entity.TzsTwoStaffing;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* Mapper 接口
*
* @author system_generator
* @date 2023-10-27
*/
public interface TzsTwoStaffingMapper extends BaseMapper<TzsTwoStaffing> {
}
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/service/ITzsTwoStaffingService.java 0 → 100644
View file @ 4ed3896e
package com.yeejoin.amos.boot.module.tcm.api.service;
/**
* 接口类
*
* @author system_generator
* @date 2023-10-27
*/
public interface ITzsTwoStaffingService {
}
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/resources/mapper/TzsTwoStaffingMapper.xml 0 → 100644
View file @ 4ed3896e
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yeejoin.amos.boot.module.tcm.api.mapper.TzsTwoStaffingMapper">
</mapper>
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/controller/TzsTwoStaffingController.java 0 → 100644
View file @ 4ed3896e
package com.yeejoin.amos.boot.module.tcm.biz.controller;
import org.springframework.web.bind.annotation.RequestMapping;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RestController;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import java.util.List;
import com.yeejoin.amos.boot.module.tcm.biz.service.impl.TzsTwoStaffingServiceImpl;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import org.springframework.beans.factory.annotation.Autowired;
import javax.servlet.http.HttpServletRequest;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.module.tcm.api.dto.TzsTwoStaffingDto;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
/**
*
*
* @author system_generator
* @date 2023-10-27
*/
@RestController
@Api(tags = "FreeMarker template error (DEBUG mode; use RETHROW in production!):
The following has evaluated to null or missing:
==> table.comment [in template "template/controller.java.ftl" at line 34, column 16]
----
Tip: It's the step after the last dot that caused this error, not those before it.
----
Tip: If the failing expression is known to legally refer to something that's sometimes null or missing, either specify a default value like myOptionalVar!myDefault, or use <#if myOptionalVar??>when-present<#else>when-missing</#if>. (These only cover the last step of the expression; to cover the whole expression, use parenthesis: (myOptionalVar.foo)!myDefault, (myOptionalVar.foo)??
----
----
FTL stack trace ("~" means nesting-related):
- Failed at: ${table.comment} [in template "template/controller.java.ftl" at line 34, column 14]
----
Java stack trace (for programmers):
----
freemarker.core.InvalidReferenceException: [... Exception message was already printed; see it above ...]
at freemarker.core.InvalidReferenceException.getInstance(InvalidReferenceException.java:134)
at freemarker.core.EvalUtil.coerceModelToTextualCommon(EvalUtil.java:481)
at freemarker.core.EvalUtil.coerceModelToStringOrMarkup(EvalUtil.java:401)
at freemarker.core.EvalUtil.coerceModelToStringOrMarkup(EvalUtil.java:370)
at freemarker.core.DollarVariable.calculateInterpolatedStringOrMarkup(DollarVariable.java:100)
at freemarker.core.DollarVariable.accept(DollarVariable.java:63)
at freemarker.core.Environment.visit(Environment.java:347)
at freemarker.core.Environment.visit(Environment.java:353)
at freemarker.core.Environment.visit(Environment.java:353)
at freemarker.core.Environment.process(Environment.java:326)
at freemarker.template.Template.process(Template.java:383)
at com.baomidou.mybatisplus.generator.engine.FreemarkerTemplateEngine.writer(FreemarkerTemplateEngine.java:52)
at com.baomidou.mybatisplus.generator.engine.AbstractTemplateEngine.batchOutput(AbstractTemplateEngine.java:81)
at com.baomidou.mybatisplus.generator.AutoGenerator.execute(AutoGenerator.java:102)
at com.yeejoin.amos.boot.biz.common.utils.MyBatisPlusCodeGeneratorTzs.main(MyBatisPlusCodeGeneratorTzs.java:305)
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/service/impl/TzsTwoStaffingServiceImpl.java 0 → 100644
View file @ 4ed3896e
package com.yeejoin.amos.boot.module.tcm.biz.service.impl;
import com.yeejoin.amos.boot.module.tcm.api.entity.TzsTwoStaffing;
import com.yeejoin.amos.boot.module.tcm.api.mapper.TzsTwoStaffingMapper;
import com.yeejoin.amos.boot.module.tcm.api.service.ITzsTwoStaffingService;
import com.yeejoin.amos.boot.module.tcm.api.dto.TzsTwoStaffingDto;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import java.util.List;
/**
* 服务实现类
*
* @author system_generator
* @date 2023-10-27
*/
@Service
public class TzsTwoStaffingServiceImpl extends BaseService<TzsTwoStaffingDto,TzsTwoStaffing,TzsTwoStaffingMapper> implements ITzsTwoStaffingService {
/**
* 分页查询
*/
public Page<TzsTwoStaffingDto> queryForTzsTwoStaffingPage(Page<TzsTwoStaffingDto> page) {
return this.queryForPage(page, null, false);
}
/**
* 列表查询 示例
*/
public List<TzsTwoStaffingDto> queryForTzsTwoStaffingList() {
return this.queryForList("" , false);
}
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment