Skip to content

A
amos-boot-biz
Commit a0936cfd authored by 刘林's avatar 刘林
Browse files
Options

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

parents e9cb1da1 f6eecf8e
Show whitespace changes
Inline Side-by-side
Showing with 1037 additions and 53 deletions
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/entity/BaseRelationEntity.java 0 → 100644
View file @ a0936cfd
package com.yeejoin.amos.boot.biz.common.entity;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* 公共实体类
*
* @author DELL
*/
@Data
public class BaseRelationEntity implements Serializable{
private static final long serialVersionUID = 1L;
@TableId(value = "sequence_nbr", type = IdType.ID_WORKER)
protected Long sequenceNbr;
@TableField(value = "rec_date", fill = FieldFill.INSERT_UPDATE)
protected Date recDate;
@TableField(value = "rec_user_id", fill = FieldFill.INSERT_UPDATE)
protected String recUserId;
@TableField(value = "rec_user_name", fill = FieldFill.INSERT_UPDATE)
protected String recUserName;
}
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/MyBatisPlusCodeGeneratorTzs.java
View file @ a0936cfd
...@@ -106,7 +106,7 @@ public class MyBatisPlusCodeGeneratorTzs { ...@@ -106,7 +106,7 @@ public class MyBatisPlusCodeGeneratorTzs {
gc.setActiveRecord(false); gc.setActiveRecord(false);
// 数据源配置 // 数据源配置
DataSourceConfig dsc = new DataSourceConfig(); DataSourceConfig dsc = new DataSourceConfig();
dsc.setUrl("jdbc:postgresql://36.46.137.116:5432/tzs_amos_tzs_biz_init?&serverTimezone=GMT%2B8"); dsc.setUrl("jdbc:postgresql://172.16.10.243:5432/tzs_amos_tzs_biz_init?&serverTimezone=GMT%2B8");
dsc.setSchemaName("amos_tzs_biz"); dsc.setSchemaName("amos_tzs_biz");
dsc.setDriverName("org.postgresql.Driver"); dsc.setDriverName("org.postgresql.Driver");
// dsc.setDriverName("cn.com.vastbase.Driver"); // dsc.setDriverName("cn.com.vastbase.Driver");
...@@ -297,8 +297,7 @@ public class MyBatisPlusCodeGeneratorTzs { ...@@ -297,8 +297,7 @@ public class MyBatisPlusCodeGeneratorTzs {
strategy.setTablePrefix(); strategy.setTablePrefix();
//去除表名前缀 //去除表名前缀
//去除表名前缀 //去除表名前缀
strategy.setTablePrefix("t_", "tb_", "sys_","other_", "rpm_", "s_", "tcb_", "cb_", "tz_", "jc_", "jcb_", strategy.setTablePrefix("t_", "tb_", "sys_","other_", "rpm_", "s_", "tcb_", "cb_", "tz_", "jc_", "jcb_");
"tzs_");
// 设置父级Controller // 设置父级Controller
strategy.setSuperControllerClass("com.yeejoin.amos.boot.biz.common.controller.BaseController"); strategy.setSuperControllerClass("com.yeejoin.amos.boot.biz.common.controller.BaseController");
autoGenerator.setStrategy(strategy); autoGenerator.setStrategy(strategy);
......
amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/TzsUserPermissionDto.java 0 → 100644
View file @ a0936cfd
package com.yeejoin.amos.boot.module.common.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 2024-08-27
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="TzsUserPermissionDto", description="用户资质信息表")
public class TzsUserPermissionDto extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "主表主键")
private Long userSeq;
@ApiModelProperty(value = "检验专用-级别")
private String permissionLevel;
@ApiModelProperty(value = "检验专用-资质项目")
private String permissionItem;
@ApiModelProperty(value = "人员类型，前端用来分组展示使用")
private String permissionPost;
@ApiModelProperty(value = "证书编号")
private String certNo;
@ApiModelProperty(value = "有效期至")
private Date expiryDate;
@ApiModelProperty(value = "发证机关")
private String approvedOrgan;
@ApiModelProperty(value = "发证日期")
private Date issueDate;
@ApiModelProperty(value = "证书附件")
private String certAttachment;
@ApiModelProperty(value = "证书类型")
private String certType;
@ApiModelProperty(value = "作业项目")
private String jobItem;
@ApiModelProperty(value = "其他作业项目")
private String otherItem;
@ApiModelProperty(value = "备注")
private String remark;
}
amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/TzsUserPermission.java 0 → 100644
View file @ a0936cfd
package com.yeejoin.amos.boot.module.common.api.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import com.yeejoin.amos.boot.biz.common.entity.BaseRelationEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.util.Date;
/**
* 用户资质信息表
*
* @author system_generator
* @date 2024-08-27
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("tzs_user_permission")
public class TzsUserPermission extends BaseRelationEntity {
private static final long serialVersionUID = 1L;
/**
* 主表主键
*/
@TableField("user_seq")
private Long userSeq;
/**
* 检验专用-级别
*/
@TableField("permission_level")
private String permissionLevel;
/**
* 检验专用-资质项目
*/
@TableField("permission_item")
private String permissionItem;
/**
* 人员类型，前端用来分组展示使用
*/
@TableField("permission_post")
private String permissionPost;
/**
* 证书编号
*/
@TableField("cert_no")
private String certNo;
/**
* 有效期至
*/
@TableField("expiry_date")
private Date expiryDate;
/**
* 发证机关
*/
@TableField("approved_organ")
private String approvedOrgan;
/**
* 发证日期
*/
@TableField("issue_date")
private Date issueDate;
/**
* 证书附件
*/
@TableField("cert_attachment")
private String certAttachment;
/**
* 证书类型
*/
@TableField("cert_type")
private String certType;
/**
* 作业项目
*/
@TableField("job_item")
private String jobItem;
/**
* 其他作业项目
*/
@TableField("other_item")
private String otherItem;
/**
* 备注
*/
@TableField("remark")
private String remark;
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/vo/JgVehicleInformationVo.java
View file @ a0936cfd
...@@ -5,6 +5,7 @@ import com.yeejoin.amos.boot.biz.common.bo.CompanyBo; ...@@ -5,6 +5,7 @@ import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
...@@ -246,5 +247,11 @@ public class JgVehicleInformationVo implements Serializable { ...@@ -246,5 +247,11 @@ public class JgVehicleInformationVo implements Serializable {
@ApiModelProperty(value = "电话") @ApiModelProperty(value = "电话")
private String phone; private String phone;
@ApiModelProperty(value = "历史设备-原使用登记表附件")
private List<?> oldUseRegistrationTable;
@ApiModelProperty(value = "历史设备-原使用登记证附件")
private List<?> oldUseRegistrationCertificate;
private CompanyBo companyInfo; private CompanyBo companyInfo;
} }
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationMapper.xml
View file @ a0936cfd
...@@ -102,15 +102,15 @@ ...@@ -102,15 +102,15 @@
<if test="dto.useUnitCode != null and dto.useUnitCode != ''"> <if test="dto.useUnitCode != null and dto.useUnitCode != ''">
and ur.use_unit_credit_code = #{dto.useUnitCode} and ur.use_unit_credit_code = #{dto.useUnitCode}
</if> </if>
<if test="roleIds != null and dto.dataType == 'supervision'"> <!-- <if test="roleIds != null and dto.dataType == 'supervision'">-->
<foreach collection='roleIds' item='role' open='and (' close=')' separator='or'> <!-- <foreach collection='roleIds' item='role' open='and (' close=')' separator='or'>-->
instance_status like concat('%',#{role},'%') <!-- instance_status like concat('%',#{role},'%')-->
</foreach> <!-- </foreach>-->
</if> <!-- </if>-->
<if test="dto.dataType == 'supervision' "> <if test="dto.dataType == 'supervision' ">
AND (ur.receive_company_code = #{dto.receiveCompanyCode} or ur.transfer_to_user_ids LIKE concat ('%', AND (ur.receive_company_code = #{dto.receiveCompanyCode} or ur.transfer_to_user_ids LIKE concat ('%',
#{dto.currentUserId}, '%')) #{dto.currentUserId}, '%'))
AND ur.instance_id <![CDATA[<>]]> '' AND ur.status <![CDATA[<>]]> '使用单位待提交'
</if> </if>
<if test="dto.dataType == 'company' "> <if test="dto.dataType == 'company' ">
AND (ur.use_unit_credit_code = #{dto.unitCode} or ur.transfer_to_user_ids LIKE concat ('%', AND (ur.use_unit_credit_code = #{dto.unitCode} or ur.transfer_to_user_ids LIKE concat ('%',
...@@ -261,7 +261,10 @@ ...@@ -261,7 +261,10 @@
INSPECT_STAFF as inspectStaff, INSPECT_STAFF as inspectStaff,
NEXT_INSPECT_DATE as nextInspectDate, NEXT_INSPECT_DATE as nextInspectDate,
INSPECT_REPORT as inspectReport INSPECT_REPORT as inspectReport
FROM "idx_biz_jg_inspection_detection_info" where RECORD = #{id} FROM "idx_biz_jg_inspection_detection_info"
where
RECORD = #{id}
ORDER BY INSPECT_DATE desc LIMIT 1
</select> </select>
<select id="getDetailById" resultType="java.util.Map"> <select id="getDetailById" resultType="java.util.Map">
select ur.sequence_nbr as sequenceNbr, select ur.sequence_nbr as sequenceNbr,
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgVehicleInformationMapper.xml
View file @ a0936cfd
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
</if> </if>
<if test="dto.dataType == 'supervision' "> <if test="dto.dataType == 'supervision' ">
and tjvi.receive_company_code = #{dto.useUnitCreditCode} and tjvi.receive_company_code = #{dto.useUnitCreditCode}
AND tjvi.instance_id <![CDATA[<>]]> '' AND tjvi.status <![CDATA[<>]]> '使用单位待提交'
</if> </if>
<if test="dto.dataType == 'company' "> <if test="dto.dataType == 'company' ">
and tjvi.use_unit_credit_code = #{dto.useUnitCreditCode} and tjvi.use_unit_credit_code = #{dto.useUnitCreditCode}
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/CommonController.java
View file @ a0936cfd
...@@ -305,6 +305,17 @@ public class CommonController extends BaseController { ...@@ -305,6 +305,17 @@ public class CommonController extends BaseController {
return ResponseHelper.buildResponse(commonService.invokeBusinessType(map)); return ResponseHelper.buildResponse(commonService.invokeBusinessType(map));
} }
/**
* 历史平台登记业务使用登记单编辑公共入口
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/updateHistory")
@ApiOperation(httpMethod = "POST", value = "历史平台登记业务使用登记单编辑公共入口", notes = "历史平台登记业务使用登记单编辑公共入口")
public ResponseModel<Object> updateHistory(@RequestBody Map<String, Object> map) {
return ResponseHelper.buildResponse(commonService.updateHistory(map));
}
/** /**
* 根据公司id获取公司下人员 * 根据公司id获取公司下人员
*/ */
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/ICommonService.java
View file @ a0936cfd
...@@ -69,6 +69,8 @@ public interface ICommonService { ...@@ -69,6 +69,8 @@ public interface ICommonService {
Object invokeBusinessType(Map<String, Object> obj); Object invokeBusinessType(Map<String, Object> obj);
Object updateHistory(Map<String, Object> obj);
Object getCompanyUser(Long companyId); Object getCompanyUser(Long companyId);
Object transfer(Map<String, Object> obj); Object transfer(Map<String, Object> obj);
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/CommonServiceImpl.java
View file @ a0936cfd
...@@ -38,6 +38,8 @@ import com.yeejoin.amos.boot.module.jg.api.service.IJgInstallationNoticeService; ...@@ -38,6 +38,8 @@ import com.yeejoin.amos.boot.module.jg.api.service.IJgInstallationNoticeService;
import com.yeejoin.amos.boot.module.jg.api.service.IJgMaintainNoticeService; import com.yeejoin.amos.boot.module.jg.api.service.IJgMaintainNoticeService;
import com.yeejoin.amos.boot.module.jg.api.service.IJgTransferNoticeService; import com.yeejoin.amos.boot.module.jg.api.service.IJgTransferNoticeService;
import com.yeejoin.amos.boot.module.jg.api.vo.SortVo; import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
import com.yeejoin.amos.boot.module.jg.biz.feign.PrivilegeFeginService;
import com.yeejoin.amos.boot.module.jg.biz.feign.TaskV2FeignService;
import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient; import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
import com.yeejoin.amos.boot.module.jg.biz.service.ICmWorkflowService; import com.yeejoin.amos.boot.module.jg.biz.service.ICmWorkflowService;
import com.yeejoin.amos.boot.module.jg.biz.service.ICommonService; import com.yeejoin.amos.boot.module.jg.biz.service.ICommonService;
...@@ -45,8 +47,6 @@ import com.yeejoin.amos.boot.module.jg.biz.utils.FileExporter; ...@@ -45,8 +47,6 @@ import com.yeejoin.amos.boot.module.jg.biz.utils.FileExporter;
import com.yeejoin.amos.boot.module.jg.biz.utils.ImageUtils; import com.yeejoin.amos.boot.module.jg.biz.utils.ImageUtils;
import com.yeejoin.amos.boot.module.jg.biz.utils.JsonUtils; import com.yeejoin.amos.boot.module.jg.biz.utils.JsonUtils;
import com.yeejoin.amos.boot.module.jg.biz.utils.WordTemplateUtils; import com.yeejoin.amos.boot.module.jg.biz.utils.WordTemplateUtils;
import com.yeejoin.amos.boot.module.jg.biz.feign.PrivilegeFeginService;
import com.yeejoin.amos.boot.module.jg.biz.feign.TaskV2FeignService;
import com.yeejoin.amos.boot.module.ymt.api.entity.EquipTechParamPipeline; import com.yeejoin.amos.boot.module.ymt.api.entity.EquipTechParamPipeline;
import com.yeejoin.amos.boot.module.ymt.api.entity.EquipmentCategory; import com.yeejoin.amos.boot.module.ymt.api.entity.EquipmentCategory;
import com.yeejoin.amos.boot.module.ymt.api.entity.RegistrationInfo; import com.yeejoin.amos.boot.module.ymt.api.entity.RegistrationInfo;
...@@ -67,7 +67,7 @@ import com.yeejoin.amos.feign.systemctl.model.TaskV2Model; ...@@ -67,7 +67,7 @@ import com.yeejoin.amos.feign.systemctl.model.TaskV2Model;
import com.yeejoin.amos.feign.workflow.model.ActTaskDTO; import com.yeejoin.amos.feign.workflow.model.ActTaskDTO;
import com.yeejoin.amos.feign.workflow.model.FlowTaskVo; import com.yeejoin.amos.feign.workflow.model.FlowTaskVo;
import com.yeejoin.amos.feign.workflow.model.ProcessTaskDTO; import com.yeejoin.amos.feign.workflow.model.ProcessTaskDTO;
import freemarker.template.*; import freemarker.template.Configuration;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.redisson.api.RBucket; import org.redisson.api.RBucket;
...@@ -90,6 +90,7 @@ import org.typroject.tyboot.core.foundation.utils.Bean; ...@@ -90,6 +90,7 @@ import org.typroject.tyboot.core.foundation.utils.Bean;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil; import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.restful.exception.instance.BadRequest; import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
import org.typroject.tyboot.core.restful.utils.ResponseModel; import org.typroject.tyboot.core.restful.utils.ResponseModel;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;
import javax.servlet.ServletOutputStream; import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
...@@ -900,6 +901,7 @@ public class CommonServiceImpl implements ICommonService { ...@@ -900,6 +901,7 @@ public class CommonServiceImpl implements ICommonService {
map.put("useUnitName", Optional.ofNullable(map.get("useUnitName")).orElse("").toString()); // 使用单位名称 map.put("useUnitName", Optional.ofNullable(map.get("useUnitName")).orElse("").toString()); // 使用单位名称
map.put("fullAddress", Optional.ofNullable(map.get("fullAddress")).orElse("").toString()); // 设备使用地点 map.put("fullAddress", Optional.ofNullable(map.get("fullAddress")).orElse("").toString()); // 设备使用地点
map.put("equList", Optional.ofNullable(map.get("equList")).orElse("").toString()); // 设备种类 map.put("equList", Optional.ofNullable(map.get("equList")).orElse("").toString()); // 设备种类
map.put("equListCode", Optional.ofNullable(map.get("equListCode")).orElse("").toString()); // 设备种类Code
map.put("equipDefine", Optional.ofNullable(map.get("equipDefine")).orElse("").toString()); // 设备品种 map.put("equipDefine", Optional.ofNullable(map.get("equipDefine")).orElse("").toString()); // 设备品种
map.put("equipCode", Optional.ofNullable(map.get("equipCode")).orElse("").toString()); // 设备代码 map.put("equipCode", Optional.ofNullable(map.get("equipCode")).orElse("").toString()); // 设备代码
map.put("equipCategory", Optional.ofNullable(map.get("equipCategory")).orElse("").toString()); // 设备类别 map.put("equipCategory", Optional.ofNullable(map.get("equipCategory")).orElse("").toString()); // 设备类别
...@@ -954,8 +956,8 @@ public class CommonServiceImpl implements ICommonService { ...@@ -954,8 +956,8 @@ public class CommonServiceImpl implements ICommonService {
// Populate template variables with default values if not present // Populate template variables with default values if not present
String[] keys = {"useRegistrationCode", "useUnitName", "fullAddress", "equList", "equipDefine", "equipCode", String[] keys = {"useRegistrationCode", "useUnitName", "fullAddress", "equList", "equipDefine", "equipCode",
"equipCategory", "useInnerCode", "factoryNum", "receiveOrgName", "giveOutYear", "equipCategory", "useInnerCode", "factoryNum", "receiveOrgName", "giveOutYear",
"giveOutMonth", "giveOutDay", "excelType", "tableName"}; "giveOutMonth", "giveOutDay", "excelType", "tableName", "carNumber"};
String[] defaultValues = {"", "", "", "", "", "", "", "", "", "", "", "", "", "使用登记", "特种设备使用登记证"}; String[] defaultValues = {"", "", "", "", "", "", "", "", "", "", "", "", "", "", "使用登记", "特种设备使用登记证"};
for (int i = 0; i < keys.length; i++) { for (int i = 0; i < keys.length; i++) {
map.put(keys[i], Optional.ofNullable(map.get(keys[i])).orElse(defaultValues[i]).toString()); map.put(keys[i], Optional.ofNullable(map.get(keys[i])).orElse(defaultValues[i]).toString());
...@@ -1262,6 +1264,21 @@ public class CommonServiceImpl implements ICommonService { ...@@ -1262,6 +1264,21 @@ public class CommonServiceImpl implements ICommonService {
} }
} }
@Override
public Object updateHistory(Map<String, Object> map) {
String historyEquType = (String) map.get(HISTORY_EQU_TYPE);
JSONObject jsonObject = new JSONObject(map);
switch (historyEquType) {
case "unit":
// return jgUseRegistrationServiceImpl.handleUnitHistoryEquip(jsonObject);
return null;
case "vehicle":
return jgVehicleInformationService.updateHistoryByVehicle(jsonObject);
default:
return jgUseRegistrationServiceImpl.updateHistoryBySet(jsonObject);
}
}
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/IdxBizJgRegisterInfoServiceImpl.java
View file @ a0936cfd
...@@ -1327,6 +1327,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste ...@@ -1327,6 +1327,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
* @param map * @param map
* @return * @return
*/ */
@Override
public Page<JSONObject> queryForEquipmentRegisterPage(JSONObject map) { public Page<JSONObject> queryForEquipmentRegisterPage(JSONObject map) {
if (map.containsKey("flag") && !map.containsKey("USE_UNIT_CREDIT_CODE")) { if (map.containsKey("flag") && !map.containsKey("USE_UNIT_CREDIT_CODE")) {
...@@ -1417,10 +1418,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste ...@@ -1417,10 +1418,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
map.put(PROJECT_CONTRAPTION, String.valueOf(map.get("projectContraption"))); map.put(PROJECT_CONTRAPTION, String.valueOf(map.get("projectContraption")));
} }
} else if (ValidationUtil.equals(queryType, "WB")) {// 维保 } else if (ValidationUtil.equals(queryType, "WB")) {// 维保
// // 查询 维保备案【可绑定设备列表】【(EQU_STATE=== null || ""）】 this.setRepeatUsedCheckFilterParam(boolMust, companyCode, JgMaintenanceContractServiceImpl.WB_PROCESS_DEFINITION_KEY);
// BoolQueryBuilder wbBuilder = QueryBuilders.boolQuery();
// wbBuilder.mustNot(QueryBuilders.existsQuery("EQU_STATE"));
// boolMust.must(wbBuilder);
} else if (ValidationUtil.equals(queryType, "SY")) {// 使用 } else if (ValidationUtil.equals(queryType, "SY")) {// 使用
// 查询 使用登记【可选设备列表】【(EQU_STATUS=== null || "" ) && (USE_ORG_CODE（使用登记证编号） ==="" || null)】 // 查询 使用登记【可选设备列表】【(EQU_STATUS=== null || "" ) && (USE_ORG_CODE（使用登记证编号） ==="" || null)】
BoolQueryBuilder syBuilder = QueryBuilders.boolQuery(); BoolQueryBuilder syBuilder = QueryBuilders.boolQuery();
...@@ -1781,6 +1779,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste ...@@ -1781,6 +1779,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
* @param map * @param map
* @return * @return
*/ */
@Override
public Page<JSONObject> queryForEquipmentRegisterPageHistory(JSONObject map) { public Page<JSONObject> queryForEquipmentRegisterPageHistory(JSONObject map) {
if (map.containsKey("flag") && !map.containsKey("USE_UNIT_CREDIT_CODE")) { if (map.containsKey("flag") && !map.containsKey("USE_UNIT_CREDIT_CODE")) {
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgMaintenanceContractServiceImpl.java
View file @ a0936cfd
...@@ -239,6 +239,16 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC ...@@ -239,6 +239,16 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
} }
} }
private void delRepeatUseEquipData(Long id, String companyCode) {
List<JgMaintenanceContractEq> list = jgMaintenanceContractEqService.lambdaQuery().eq(JgMaintenanceContractEq::getEquipTransferId, id).list();
// 获取单位变更设备列表
if (CollectionUtils.isEmpty(list)) {
return;
}
List<String> records = list.stream().map(JgMaintenanceContractEq::getEquId).collect(Collectors.toList());
EquipUsedCheckStrategyContext.getUsedStrategy(WB_PROCESS_DEFINITION_KEY).delDataForCheckEquipRepeatUsed(records, companyCode);
}
public InstanceRuntimeData buildInstanceRuntimeData(JgMaintenanceContract jgMaintenanceContract) { public InstanceRuntimeData buildInstanceRuntimeData(JgMaintenanceContract jgMaintenanceContract) {
return InstanceRuntimeData.builder() return InstanceRuntimeData.builder()
.nextExecuteUserIds(jgMaintenanceContract.getNextExecuteUserIds()) .nextExecuteUserIds(jgMaintenanceContract.getNextExecuteUserIds())
...@@ -278,6 +288,8 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC ...@@ -278,6 +288,8 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
commonService.deleteTaskModel(String.valueOf(jgMaintenanceContract.getSequenceNbr()), jgMaintenanceContract.getInstanceId()); commonService.deleteTaskModel(String.valueOf(jgMaintenanceContract.getSequenceNbr()), jgMaintenanceContract.getInstanceId());
// 删除业务单 // 删除业务单
this.baseMapper.deleteById(seq); this.baseMapper.deleteById(seq);
// 删除流程中的设备维保
this.delRepeatUseEquipData(jgMaintenanceContract.getSequenceNbr(), jgMaintenanceContract.getUseUnitCode());
// 删除对应eq // 删除对应eq
jgMaintenanceContractEqService.getBaseMapper().delete(new LambdaQueryWrapper<JgMaintenanceContractEq>() jgMaintenanceContractEqService.getBaseMapper().delete(new LambdaQueryWrapper<JgMaintenanceContractEq>()
.eq(JgMaintenanceContractEq::getEquipTransferId, seq)); .eq(JgMaintenanceContractEq::getEquipTransferId, seq));
...@@ -783,30 +795,19 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC ...@@ -783,30 +795,19 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
maintenanceContract.setNextExecuteUserIds(null); maintenanceContract.setNextExecuteUserIds(null);
maintenanceContract.setPromoter(null); maintenanceContract.setPromoter(null);
this.updateById(maintenanceContract); this.updateById(maintenanceContract);
this.processElseDataByStatus(Objects.requireNonNull(this.confirmBusinessPhase(oldNoticeStatus)), maintenanceContract); this.processElseDataByStatus(this.confirmBusinessPhase(oldNoticeStatus), maintenanceContract);
return maintenanceContract; return maintenanceContract;
} }
private FlowStatusEnum confirmBusinessPhase(String status) { private FlowStatusEnum confirmBusinessPhase(String status) {
Set<String> toBeSubmittedSet = new HashSet<>(Arrays.asList( if ( WorkFlowStatusEnum.MAIN_SUBMIT.getPass().contains(status)) {
WorkFlowStatusEnum.MAIN_SUBMIT.getPass(),
WorkFlowStatusEnum.MAIN_SUBMIT.getReject(),
WorkFlowStatusEnum.MAIN_SUBMIT.getRollBack(),
WorkFlowStatusEnum.MAIN_RECEIVE.getPass(),
WorkFlowStatusEnum.MAIN_RECEIVE.getReject(),
WorkFlowStatusEnum.MAIN_RECEIVE.getRollBack(),
WorkFlowStatusEnum.MAIN_PRELIMINARY.getPass()
));
if (toBeSubmittedSet.contains(status)) {
return FlowStatusEnum.TO_BE_SUBMITTED; return FlowStatusEnum.TO_BE_SUBMITTED;
} }
if (FlowStatusEnum.TO_BE_FINISHED.getName().equals(status)) { if ( WorkFlowStatusEnum.MAIN_PRELIMINARY.getPass().contains(status)) {
return FlowStatusEnum.TO_BE_FINISHED; return FlowStatusEnum.TO_BE_FINISHED;
} }
return FlowStatusEnum.TO_BE_PROCESSED;
return null;
} }
private void processElseDataByStatus(FlowStatusEnum oldNoticeStatus, JgMaintenanceContract contract) { private void processElseDataByStatus(FlowStatusEnum oldNoticeStatus, JgMaintenanceContract contract) {
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgUseRegistrationManageServiceImpl.java
View file @ a0936cfd
...@@ -16,7 +16,8 @@ import com.yeejoin.amos.boot.module.jg.api.service.IJgChangeRegistrationTransfer ...@@ -16,7 +16,8 @@ import com.yeejoin.amos.boot.module.jg.api.service.IJgChangeRegistrationTransfer
import com.yeejoin.amos.boot.module.jg.api.service.IJgUseRegistrationManageService; import com.yeejoin.amos.boot.module.jg.api.service.IJgUseRegistrationManageService;
import com.yeejoin.amos.boot.module.jg.api.vo.SortVo; import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
import com.yeejoin.amos.boot.module.ymt.api.common.StringUtil; import com.yeejoin.amos.boot.module.ymt.api.common.StringUtil;
import com.yeejoin.amos.boot.module.ymt.api.entity.*; import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgMaintenanceRecordInfo;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgUseInfo;
import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum; import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import org.apache.lucene.queryparser.classic.QueryParser; import org.apache.lucene.queryparser.classic.QueryParser;
...@@ -540,6 +541,7 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr ...@@ -540,6 +541,7 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
} }
exportParamsMap.put("applyNo", manage.getApplyNo()); exportParamsMap.put("applyNo", manage.getApplyNo());
exportParamsMap.put("carNumber", manage.getCarNumber()); exportParamsMap.put("carNumber", manage.getCarNumber());
exportParamsMap.put("equListCode", manage.getEquListCode());
if ("0".equals(printType)) { if ("0".equals(printType)) {
// 调用生成使用登记证 // 调用生成使用登记证
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgUseRegistrationServiceImpl.java
View file @ a0936cfd
...@@ -695,15 +695,6 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD ...@@ -695,15 +695,6 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
.collect(Collectors.toList()) .collect(Collectors.toList())
); );
// 工业管道校验检验检测信息
if (!CylinderTypeEnum.CYLINDER.getCode().equals(map.get("EQU_CATEGORY_CODE")) &&
(inspectionDetectionInfoList.isEmpty() || inspectionDetectionInfoList.stream().anyMatch(info ->
ObjectUtils.isEmpty(info) || ObjectUtils.isEmpty(info.getInspectType()) ||
ObjectUtils.isEmpty(info.getInspectConclusion()) || ObjectUtils.isEmpty(info.getInspectOrgCode()) ||
ObjectUtils.isEmpty(info.getInspectOrgName())))) {
throw new BadRequest("请补充设备检验检测信息后提交！");
}
JgUseRegistration useRegistration = JSON.parseObject(JSON.toJSONString(map), JgUseRegistration.class); JgUseRegistration useRegistration = JSON.parseObject(JSON.toJSONString(map), JgUseRegistration.class);
useRegistration.setRegDate(new Date()); useRegistration.setRegDate(new Date());
useRegistration.setCreateDate(new Date()); useRegistration.setCreateDate(new Date());
...@@ -1112,6 +1103,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD ...@@ -1112,6 +1103,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
jgUseRegistrationManage.setCreateUserId(jgUseRegistration.getCreateUserId()); jgUseRegistrationManage.setCreateUserId(jgUseRegistration.getCreateUserId());
jgUseRegistrationManage.setCreateDate(jgUseRegistration.getRecDate()); jgUseRegistrationManage.setCreateDate(jgUseRegistration.getRecDate());
jgUseRegistrationManage.setEquUseAddress(jgUseRegistration.getUseAddress()); jgUseRegistrationManage.setEquUseAddress(jgUseRegistration.getUseAddress());
jgUseRegistrationManage.setCarNumber(registerInfo.getCarNumber());
jgUseRegistrationManage.setUseUnitAddress(!ValidationUtil.isEmpty(enterpriseInfo) ? (String) enterpriseInfo.get("address") : ""); jgUseRegistrationManage.setUseUnitAddress(!ValidationUtil.isEmpty(enterpriseInfo) ? (String) enterpriseInfo.get("address") : "");
jgUseRegistrationManage.setUseRegistrationCode(jgUseRegistration.getUseRegistrationCode()); jgUseRegistrationManage.setUseRegistrationCode(jgUseRegistration.getUseRegistrationCode());
jgUseRegistrationManage.setUseUnitCreditCode(jgUseRegistration.getUseUnitCreditCode()); jgUseRegistrationManage.setUseUnitCreditCode(jgUseRegistration.getUseUnitCreditCode());
...@@ -1924,6 +1916,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD ...@@ -1924,6 +1916,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
throw new BadRequest("使用登记证导出失败,设备代码为空!"); throw new BadRequest("使用登记证导出失败,设备代码为空!");
} }
exportParamsMap.put("equCode", registerInfo.getEquCode()); exportParamsMap.put("equCode", registerInfo.getEquCode());
exportParamsMap.put("carNumber", registerInfo.getCarNumber());
exportParamsMap.put("equListCode", registerInfo.getEquList());
} }
IdxBizJgUseInfo useInfo = idxBizJgUseInfoService.getOneData(useRegistrationEqList.get(0).getEquId()); IdxBizJgUseInfo useInfo = idxBizJgUseInfoService.getOneData(useRegistrationEqList.get(0).getEquId());
...@@ -3091,4 +3085,133 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD ...@@ -3091,4 +3085,133 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
return map; return map;
} }
/**
* 历史登记设备编辑接口
* @param map 入参
* @return
*/
public List<Map<String, Object>> updateHistoryBySet(JSONObject map) {
try {
ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
CompanyBo company = reginParams.getCompany();
String record = String.valueOf(map.get("equipId"));
// 使用登记信息
JgUseRegistration jgUseRegistration = new JgUseRegistration();
jgUseRegistration.setRegDate(new Date());
jgUseRegistration.setCreateDate(new Date());
LambdaQueryWrapper<IdxBizJgOtherInfo> otherLambda = new QueryWrapper<IdxBizJgOtherInfo>().lambda();
otherLambda.eq(IdxBizJgOtherInfo::getRecord, record);
IdxBizJgOtherInfo otherInfo = otherInfoMapper.selectOne(otherLambda);
String supervisoryCode = otherInfo.getSupervisoryCode();
jgUseRegistration.setSupervisoryCode(supervisoryCode);
// 其他附件
if (!ObjectUtils.isEmpty(map.get("otherAccessories"))) {
jgUseRegistration.setOtherAccessories(JSONObject.toJSONString(map.get("otherAccessories")));
}
if (map.containsKey("receiveOrgCode")) {
// 接收单位信息
String[] splitMaintenanceUnitCode = String.valueOf(map.getString("receiveOrgCode")).split("_");
jgUseRegistration.setReceiveCompanyCode(splitMaintenanceUnitCode[0]);
jgUseRegistration.setReceiveOrgName(splitMaintenanceUnitCode[1]);
jgUseRegistration.setReceiveCompanyOrgCode(commonService.getOneCompany(jgUseRegistration.getReceiveCompanyCode()).getOrgCode());
}
// 安全管理员
if (map.containsKey("safetyManager")) {
String[] data = String.valueOf(map.getString("safetyManager")).split("_");
map.put("safetyManagerId", data[0]);
map.put("safetyManagerName", data[1]);
}
// 使用单位提交
jgUseRegistration.setUseUnitName(CompanyTypeEnum.INDIVIDUAL.getName().equals(company.getCompanyType()) ?
company.getCompanyName().split("_")[1] : company.getCompanyName());
jgUseRegistration.setUseUnitCreditCode(CompanyTypeEnum.INDIVIDUAL.getName().equals(company.getCompanyType()) ?
company.getCompanyCode().split("_")[1] : company.getCompanyCode());
jgUseRegistration.setCreateUserId(reginParams.getUserModel().getUserId());
jgUseRegistration.setCreateUserName(reginParams.getUserModel().getUserName());
if (!ObjectUtils.isEmpty(map.get("inspectUnitCreditCode"))) {
jgUseRegistration.setInspectUnitCreditCode(map.get("inspectUnitCreditCode").toString());
}
if (!ObjectUtils.isEmpty(map.get("inspectOrgName"))) {
jgUseRegistration.setInspectUnitName(map.get("inspectOrgName").toString());
}
// 是否西咸
if (!ObjectUtils.isEmpty(map.get("isXixian"))) {
jgUseRegistration.setIsXixian(String.valueOf(map.get("isXixian")));
}
// 使用地点
// 市
List<LinkedHashMap> city = (List<LinkedHashMap>) redisUtils.get("CITY");
// 区
List<LinkedHashMap> region = (List<LinkedHashMap>) redisUtils.get("REGION");
// 街道
List<LinkedHashMap> street = (List<LinkedHashMap>) redisUtils.get("STREET");
jgUseRegistration.setUseAddress("陕西省");
// 城市
if (!ObjectUtils.isEmpty(map.get("city")) && !ObjectUtils.isEmpty(city)) {
city.forEach(item -> {
if (String.valueOf(item.get("regionCode")).equals(String.valueOf(map.get("city")))) {
jgUseRegistration.setUseAddress(jgUseRegistration.getUseAddress() + item.get("regionName"));
}
});
}
// 区县
if (!ObjectUtils.isEmpty(map.get("county")) && !ObjectUtils.isEmpty(city)) {
region.forEach(item -> {
if (String.valueOf(item.get("regionCode")).equals(String.valueOf(map.get("county")))) {
jgUseRegistration.setUseAddress(jgUseRegistration.getUseAddress() + item.get("regionName"));
}
});
}
// 街道
if (!ObjectUtils.isEmpty(map.get("factoryUseSiteStreet")) && !ObjectUtils.isEmpty(city)) {
street.forEach(item -> {
if (String.valueOf(item.get("regionCode")).equals(String.valueOf(map.get("factoryUseSiteStreet")))) {
jgUseRegistration.setUseAddress(jgUseRegistration.getUseAddress() + item.get("regionName"));
}
});
}
jgUseRegistration.setUseAddress(jgUseRegistration.getUseAddress() + map.get("address"));
jgUseRegistration.setAuditPassDate(new Date());
jgUseRegistration.setSequenceNbr(Long.valueOf(String.valueOf(map.get("sequenceNbr"))));
this.getBaseMapper().updateById(jgUseRegistration);
// 历史设备登记生成的 编辑时更新使用登记证管理表
updateRegistrationManage(Long.valueOf(String.valueOf(map.get("sequenceNbr"))));
// 更新使用信息表中的附件信息
LambdaQueryWrapper<IdxBizJgUseInfo> lambda = new QueryWrapper<IdxBizJgUseInfo>().lambda();
lambda.eq(IdxBizJgUseInfo::getRecord, record);
IdxBizJgUseInfo useInfo = new IdxBizJgUseInfo();
useInfo.setOldUseRegistrationTable(JSON.toJSONString(map.get("oldUseRegistrationTable")));
useInfo.setOldUseRegistrationCertificate(JSON.toJSONString(map.get("oldUseRegistrationCertificate")));
useInfoMapper.update(useInfo, lambda);
// 更新检验检测信息【一对多，暂时只取最新一条数据】
IdxBizJgInspectionDetectionInfo inspectionDetectionInfo = iIdxBizJgInspectionDetectionInfoService.queryNewestDetailByRecord(record);
if (ObjectUtils.isEmpty(inspectionDetectionInfo.getSequenceNbr())) {
inspectionDetectionInfo.setRecord((String) map.get("equipId"));
}
inspectionDetectionInfo.setInspectOrgCode(String.valueOf(map.get("inspectOrgCode")));
inspectionDetectionInfo.setInspectOrgName(String.valueOf(map.get("inspectOrgName")));
inspectionDetectionInfo.setInspectConclusion(String.valueOf(map.get("inspectConclusion")));
inspectionDetectionInfo.setInspectType(String.valueOf(map.get("inspectType")));
inspectionDetectionInfo.setInspectDate(DateUtil.parse(String.valueOf(map.get("inspectDate")), "yyyy-MM-dd"));
inspectionDetectionInfo.setInspectStaff(String.valueOf(map.get("inspectStaff")));
inspectionDetectionInfo.setNextInspectDate(DateUtil.parse(String.valueOf(map.get("nextInspectDate")), "yyyy-MM-dd"));
inspectionDetectionInfo.setInspectReport(JSONObject.toJSONString(map.get("inspectReport")));
iIdxBizJgInspectionDetectionInfoService.saveOrUpdateData(inspectionDetectionInfo);
// 暂存历史表
updateHistory(map, record, String.valueOf(jgUseRegistration.getSequenceNbr()), jgUseRegistration.getSupervisoryCode());
return this.baseMapper.getDetailById(jgUseRegistration.getSequenceNbr());
} catch (BadRequest | LocalBadRequest e) {
log.error(e.getMessage(), e);
this.rollBackForDelRedisData();
throw e;
} catch (Exception e) {
log.error(e.getMessage(), e);
this.rollBackForDelRedisData();
throw new BadRequest("保存失败！");
} finally {
FlowingEquipRedisContext.clean();
}
}
} }
\ No newline at end of file
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgVehicleInformationServiceImpl.java
View file @ a0936cfd
...@@ -31,10 +31,10 @@ import com.yeejoin.amos.boot.module.jg.biz.config.LocalBadRequest; ...@@ -31,10 +31,10 @@ import com.yeejoin.amos.boot.module.jg.biz.config.LocalBadRequest;
import com.yeejoin.amos.boot.module.jg.biz.context.EquipUsedCheckStrategyContext; import com.yeejoin.amos.boot.module.jg.biz.context.EquipUsedCheckStrategyContext;
import com.yeejoin.amos.boot.module.jg.biz.context.FlowingEquipRedisContext; import com.yeejoin.amos.boot.module.jg.biz.context.FlowingEquipRedisContext;
import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient; import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
import com.yeejoin.amos.boot.module.jg.biz.feign.WorkFlowFeignService;
import com.yeejoin.amos.boot.module.jg.biz.service.ICmWorkflowService; import com.yeejoin.amos.boot.module.jg.biz.service.ICmWorkflowService;
import com.yeejoin.amos.boot.module.jg.biz.utils.FileExporter; import com.yeejoin.amos.boot.module.jg.biz.utils.FileExporter;
import com.yeejoin.amos.boot.module.jg.biz.utils.ImageUtils; import com.yeejoin.amos.boot.module.jg.biz.utils.ImageUtils;
import com.yeejoin.amos.boot.module.jg.biz.feign.WorkFlowFeignService;
import com.yeejoin.amos.boot.module.ymt.api.entity.*; import com.yeejoin.amos.boot.module.ymt.api.entity.*;
import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum; import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
import com.yeejoin.amos.boot.module.ymt.api.enums.EquCodeTypeEnum; import com.yeejoin.amos.boot.module.ymt.api.enums.EquCodeTypeEnum;
...@@ -68,6 +68,7 @@ import org.typroject.tyboot.core.foundation.utils.ValidationUtil; ...@@ -68,6 +68,7 @@ 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.exception.instance.BadRequest; import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
import org.typroject.tyboot.core.restful.utils.ResponseModel; import org.typroject.tyboot.core.restful.utils.ResponseModel;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.File; import java.io.File;
import java.math.BigDecimal; import java.math.BigDecimal;
...@@ -79,6 +80,7 @@ import java.util.*; ...@@ -79,6 +80,7 @@ import java.util.*;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
import static com.yeejoin.amos.boot.module.jg.api.enums.VehicleApanageEnum.XIAN_YANG; import static com.yeejoin.amos.boot.module.jg.api.enums.VehicleApanageEnum.XIAN_YANG;
import static com.yeejoin.amos.boot.module.jg.api.enums.VehicleApanageEnum.XI_XIAN; import static com.yeejoin.amos.boot.module.jg.api.enums.VehicleApanageEnum.XI_XIAN;
import static com.yeejoin.amos.boot.module.jg.biz.service.impl.JgUseRegistrationServiceImpl.getAuditPassedDate; import static com.yeejoin.amos.boot.module.jg.biz.service.impl.JgUseRegistrationServiceImpl.getAuditPassedDate;
...@@ -642,6 +644,15 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform ...@@ -642,6 +644,15 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
.map(map -> (String) map.get("equDefine")) .map(map -> (String) map.get("equDefine"))
.orElse(null) .orElse(null)
); );
// 历史表历史证
Optional<? extends Map> firstEqu = vo.getEquipmentLists().stream().findFirst();
if (firstEqu.isPresent()) {
LambdaQueryWrapper<IdxBizJgUseInfo> lambda = new QueryWrapper<IdxBizJgUseInfo>().lambda();
lambda.eq(IdxBizJgUseInfo::getRecord, firstEqu.get().get("record"));
IdxBizJgUseInfo useInfo = useInfoMapper.selectOne(lambda);
vo.setOldUseRegistrationTable(JSONArray.parseArray(useInfo.getOldUseRegistrationTable()));
vo.setOldUseRegistrationCertificate(JSONArray.parseArray(useInfo.getOldUseRegistrationCertificate()));
}
return vo; return vo;
} }
...@@ -1933,6 +1944,193 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform ...@@ -1933,6 +1944,193 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
} }
/** /**
* 车用气瓶保存历史数据
*
* @param map map
* @return list
*/
@Transactional(rollbackFor = Exception.class)
@GlobalTransactional(rollbackFor = Exception.class)
public List<JgVehicleInformation> updateHistoryByVehicle(JSONObject map) {
ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())) + "", ReginParams.class);
JgVehicleInformationDto vehicleInfoDto = JSON.parseObject(JSON.toJSONString(map), JgVehicleInformationDto.class);
List<Map<String, Object>> equipmentLists = (List<Map<String, Object>>) map.get("equipmentLists");
CompanyBo company = reginParams.getCompany();
vehicleInfoDto.setCreateDate(new Date());
vehicleInfoDto.setPromoter(reginParams.getUserModel().getUserId());
// 车牌号码 字段的唯一性校验
LambdaQueryWrapper<JgVehicleInformation> vehicleInfoWrapper = new LambdaQueryWrapper<JgVehicleInformation>()
.eq(JgVehicleInformation::getCarNumber, vehicleInfoDto.getCarNumber())
.eq(JgVehicleInformation::getIsDelete, false)
.ne(JgVehicleInformation::getStatus, "已作废")
.ne(JgVehicleInformation::getStatus, "使用单位待提交")
.ne(!ValidationUtil.isEmpty(vehicleInfoDto.getSequenceNbr()), JgVehicleInformation::getSequenceNbr, vehicleInfoDto.getSequenceNbr());
Integer count = this.baseMapper.selectCount(vehicleInfoWrapper);
if (count > 0) {
throw new LocalBadRequest("车牌号码已存在，请重新输入！");
}
// 【A109】 车用气瓶登记业务 车辆VIN码 校验唯一性
LambdaQueryWrapper<JgVehicleInformation> informationLambdaQueryWrapper = new LambdaQueryWrapper<JgVehicleInformation>()
.eq(JgVehicleInformation::getIdentificationCode, vehicleInfoDto.getIdentificationCode())
.eq(JgVehicleInformation::getIsDelete, false)
.ne(JgVehicleInformation::getStatus, "已作废")
.ne(JgVehicleInformation::getStatus, "使用单位待提交")
.ne(!ValidationUtil.isEmpty(vehicleInfoDto.getSequenceNbr()), JgVehicleInformation::getSequenceNbr, vehicleInfoDto.getSequenceNbr());
Integer identificationCodeCount = this.baseMapper.selectCount(informationLambdaQueryWrapper);
if (identificationCodeCount > 0) {
throw new BadRequest("车辆VIN码已存在，请重新输入！");
}
// 使用单位信息
if ("个人主体".equals(company.getCompanyType())) {
vehicleInfoDto.setUseUnitName(company.getCompanyName().split("_")[1]);
vehicleInfoDto.setUseUnitCreditCode(company.getCompanyCode().split("_")[1]);
} else {
vehicleInfoDto.setUseUnitName(company.getCompanyName());
vehicleInfoDto.setUseUnitCreditCode(company.getCompanyCode());
}
// 接收单位信息
if (!StringUtils.isEmpty(vehicleInfoDto.getReceiveOrgCode())) {
String[] splitReceiveOrgCode = vehicleInfoDto.getReceiveOrgCode().split("_");
CompanyModel result = Privilege.companyClient.queryByCompanyCode(splitReceiveOrgCode[0]).getResult();
vehicleInfoDto.setReceiveOrgCode(splitReceiveOrgCode[0]);
vehicleInfoDto.setReceiveOrgName(splitReceiveOrgCode[1]);
vehicleInfoDto.setReceiveCompanyCode(result.getCompanyCode());
}
//检验机构信息
if (!StringUtils.isEmpty(vehicleInfoDto.getInspectUnitCreditCode())) {
String[] splitInspectUnitCreditCode = vehicleInfoDto.getInspectUnitCreditCode().split("_");
vehicleInfoDto.setInspectUnitCreditCode(splitInspectUnitCreditCode[0]);
vehicleInfoDto.setInspectUnitName(splitInspectUnitCreditCode[1]);
}
//安装单位信息
if (!StringUtils.isEmpty(vehicleInfoDto.getInstallUnitCode())) {
String[] splitInstallUnitCode = vehicleInfoDto.getInstallUnitCode().split("_");
vehicleInfoDto.setInstallUnitCode(splitInstallUnitCode[0]);
vehicleInfoDto.setInstallUnitName(splitInstallUnitCode[1]);
}
//属地监管部门
if (!StringUtils.isEmpty(vehicleInfoDto.getOrgBranchCode())) {
String[] splitOrgBranchCode = vehicleInfoDto.getOrgBranchCode().split("_");
vehicleInfoDto.setOrgBranchCode(splitOrgBranchCode[0]);
vehicleInfoDto.setOrgBranchName(splitOrgBranchCode[1]);
}
// 安全管理员
Optional.ofNullable(map.getString("safetyManagerId"))
.filter(manager -> manager.contains("_"))
.map(manager -> manager.split("_"))
.ifPresent(data -> {
vehicleInfoDto.setSafetyManagerId(data[0]);
vehicleInfoDto.setSafetyManagerName(data[1]);
});
// 产权单位信息
if (!StringUtils.isEmpty(vehicleInfoDto.getEstateUnitName())) {
String[] data = String.valueOf(map.getString("estateUnitName")).split("_");
vehicleInfoDto.setEstateUnitCreditCode(data[0]);
vehicleInfoDto.setEstateUnitName(data[1]);
}
// 其他附件
if (!ObjectUtils.isEmpty(map.get("otherAccessories"))) {
vehicleInfoDto.setOtherAccessories(JSONObject.toJSONString(map.get("otherAccessories")));
}
JgVehicleInformation vehicleInformation = new JgVehicleInformation();
BeanUtils.copyProperties(vehicleInfoDto, vehicleInformation);
vehicleInformation.setCreateUserId(reginParams.getUserModel().getUserId());
vehicleInformation.setRegDate(new Date());
vehicleInformation.setCreateUserName(reginParams.getUserModel().getRealName());
vehicleInformation.setGasNum(equipmentLists.size());
BigDecimal totalVolume = equipmentLists.stream()
.map(x -> new BigDecimal(String.valueOf(x.get("singleBottleVolume"))))
.reduce(BigDecimal.ZERO, BigDecimal::add);
vehicleInformation.setVolume(totalVolume.toPlainString());
vehicleInformation.setAuditPassDate(new Date());
// 登记证记录表主键
Long changeRecordId = sequence.nextId();
this.getBaseMapper().updateById(vehicleInformation);
JgUseRegistrationManage useRegistrationCode = jgUseRegistrationManageService.lambdaQuery()
.eq(JgUseRegistrationManage::getUseRegistrationCode, vehicleInformation.getUseRegistrationCode())
.one();
if (useRegistrationCode != null) {
useRegistrationCode.setCarNumber(vehicleInformation.getCarNumber());
jgUseRegistrationManageService.updateById(useRegistrationCode);
}
// 更新关联气瓶信息
if (!CollectionUtils.isEmpty(equipmentLists)) {
List<JgVehicleInformationEq> equipList = new ArrayList<>();
equipmentLists.forEach(x -> {
JgVehicleInformationEq equip = new JgVehicleInformationEq();
equip.setEquId(String.valueOf(x.get("record")));
equip.setVehicleId(vehicleInformation.getSequenceNbr() + "");
equipList.add(equip);
jgResumeInfoService.createWithModel(JgResumeInfoDto.builder()
.applyNo(vehicleInformation.getApplyNo())
.businessType(BusinessTypeEnum.JG_VEHICLE_GAS_APPLICATION.getName())
.businessId(vehicleInformation.getSequenceNbr() + "")
.equId(String.valueOf(x.get("record")))
.approvalUnit(vehicleInformation.getReceiveOrgName())
.approvalUnitCode(vehicleInformation.getReceiveOrgCode())
.status("正常")
.build());
// 查询注册信息
LambdaQueryWrapper<IdxBizJgRegisterInfo> queryRegisterWrapper = new QueryWrapper<IdxBizJgRegisterInfo>().lambda();
queryRegisterWrapper.eq(IdxBizJgRegisterInfo::getRecord, String.valueOf(x.get("record")));
IdxBizJgRegisterInfo registerInfo = idxBizJgRegisterInfoMapper.selectOne(queryRegisterWrapper);
registerInfo.setUseOrgCode(vehicleInformation.getUseRegistrationCode());
// 更新使用信息
LambdaQueryWrapper<IdxBizJgUseInfo> useInfoLambdaQueryWrapper = new QueryWrapper<IdxBizJgUseInfo>().lambda();
useInfoLambdaQueryWrapper.eq(IdxBizJgUseInfo::getRecord, String.valueOf(x.get("record")));
IdxBizJgUseInfo useInfo = useInfoMapper.selectOne(useInfoLambdaQueryWrapper);
useInfo.setOldUseRegistrationTable(JSON.toJSONString(map.get("oldUseRegistrationTable")));
useInfo.setOldUseRegistrationCertificate(JSON.toJSONString(map.get("oldUseRegistrationCertificate")));
useInfoMapper.updateById(useInfo);
// 更新注册登记信息表
LambdaUpdateWrapper<IdxBizJgRegisterInfo> updateRegisterWrapper = new UpdateWrapper<IdxBizJgRegisterInfo>().lambda();
this.generateEquCode(updateRegisterWrapper, registerInfo, vehicleInformation.getReceiveCompanyCode());
updateRegisterWrapper.eq(IdxBizJgRegisterInfo::getRecord, registerInfo.getRecord());
updateRegisterWrapper.set(true, IdxBizJgRegisterInfo::getUseOrgCode, vehicleInformation.getUseRegistrationCode());
idxBizJgRegisterInfoService.update(updateRegisterWrapper);
// 查询其他信息
LambdaQueryWrapper<IdxBizJgOtherInfo> otherInfoWrapper = new QueryWrapper<IdxBizJgOtherInfo>().lambda();
otherInfoWrapper.eq(IdxBizJgOtherInfo::getRecord, String.valueOf(x.get("record")));
IdxBizJgOtherInfo otherInfo = otherInfoMapper.selectOne(otherInfoWrapper);
// 更新设备信息
this.updateEquipInfo(vehicleInformation, registerInfo, otherInfo, String.valueOf(x.get("record")));
// 更新es
this.updateEquipEsData(vehicleInformation, otherInfo, registerInfo, String.valueOf(x.get("record")));
// 查询设备制造信息
LambdaQueryWrapper<IdxBizJgFactoryInfo> factoryInfoWrapper = new LambdaQueryWrapper<>();
factoryInfoWrapper.eq(IdxBizJgFactoryInfo::getRecord, String.valueOf(x.get("record")));
IdxBizJgFactoryInfo idxBizJgFactoryInfo = idxBizJgFactoryInfoMapper.selectOne(factoryInfoWrapper);
// 生成tzs_jg_certificate_change_record_eq记录
JgCertificateChangeRecordEq changeRecordEq = new JgCertificateChangeRecordEq();
changeRecordEq.setChangeRecordId(String.valueOf(changeRecordId));//登记证记录主键
changeRecordEq.setEquId(registerInfo.getRecord());//设备主键
changeRecordEq.setProductCode(idxBizJgFactoryInfo.getFactoryNum());//产品编号
certificateChangeRecordEqService.save(changeRecordEq);
});
}
return Collections.singletonList(vehicleInformation);
}
/**
* 系统类型的code 自动生成设备代码 * 系统类型的code 自动生成设备代码
* *
* @param lambda lambda * @param lambda lambda
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/utils/WordTemplateUtils.java
View file @ a0936cfd
...@@ -254,6 +254,9 @@ public class WordTemplateUtils { ...@@ -254,6 +254,9 @@ public class WordTemplateUtils {
.replace("<", "&lt;") .replace("<", "&lt;")
.replace(">", "&gt;") .replace(">", "&gt;")
.replace("\"", "&quot;") .replace("\"", "&quot;")
.replace("'", "&apos;"); .replace("'", "&apos;")
.replace("(", "&#40;")
.replace(")", "&#41;");
} }
} }
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/templates/equipment-registration-certificate-report.ftl
View file @ a0936cfd
<?xml version="1.0" encoding="UTF-8" standalone="yes"?> <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<?mso-application progid="Word.Document"?> <?mso-application progid="Word.Document"?>
<w:wordDocument xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:sl="http://schemas.microsoft.com/schemaLibrary/2003/core" xmlns:aml="http://schemas.microsoft.com/aml/2001/core" xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882" w:macrosPresent="no" w:embeddedObjPresent="no" w:ocxPresent="no" xml:space="preserve" xmlns:wpsCustomData="http://www.wps.cn/officeDocument/2013/wpsCustomData"> <w:wordDocument xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml" xmlns:v="urn:schemas-microsoft-com:vml"
xmlns:w10="urn:schemas-microsoft-com:office:word"
xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint"
xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882"
w:macrosPresent="no" w:embeddedObjPresent="no" w:ocxPresent="no" xml:space="preserve">
<o:DocumentProperties> <o:DocumentProperties>
<o:Author>光</o:Author> <o:Author>光</o:Author>
<o:LastAuthor>光</o:LastAuthor> <o:LastAuthor>光</o:LastAuthor>
...@@ -892,6 +896,57 @@ ...@@ -892,6 +896,57 @@
</v:shape> </v:shape>
</w:pict> </w:pict>
</w:r> </w:r>
<#if equListCode == "5000">
<w:r>
<w:rPr>
<w:sz w:val="24"/>
</w:rPr>
<w:pict>
<v:shape id="文本框 17" o:spid="_x0000_s1032" o:spt="202" type="#_x0000_t202" style="position:absolute;left:0pt;margin-left:394pt;margin-top:550pt;height:130.25pt;width:132.05pt;z-index:251672576;mso-width-relative:page;mso-height-relative:page;" fillcolor="#FFFFFF" filled="t" stroked="f" coordsize="21600,21600">
<v:path/>
<v:fill on="t" color2="#FFFFFF" focussize="0,0"/>
<v:stroke on="f" weight="0.5pt"/>
<v:imagedata o:title=""/>
<o:lock v:ext="edit" aspectratio="f"/>
<v:textbox>
<w:txbxContent>
<w:p>
<w:pPr>
<w:keepNext w:val="off"/>
<w:keepLines w:val="off"/>
<w:pageBreakBefore w:val="off"/>
<w:widowControl w:val="off"/>
<w:kinsoku/>
<w:wordWrap/>
<w:overflowPunct/>
<w:topLinePunct w:val="off"/>
<w:adjustRightInd/>
<w:snapToGrid/>
<w:spacing w:line="120" w:line-rule="auto"/>
<w:textAlignment w:val="auto"/>
<w:rPr>
<w:rFonts w:ascii="黑体" w:h-ansi="黑体" w:fareast="黑体" w:cs="黑体" w:hint="default"/>
<w:sz w:val="24"/>
<w:sz-cs w:val="24"/>
<w:lang w:val="EN-US" w:fareast="ZH-CN"/>
</w:rPr>
</w:pPr>
<w:r>
<w:rPr>
<w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:fareast="宋体" w:cs="宋体" w:hint="fareast"/>
<w:sz w:val="24"/>
<w:sz-cs w:val="24"/>
<w:lang w:val="EN-US" w:fareast="ZH-CN"/>
</w:rPr>
<w:t>${(carNumber)!''}</w:t>
</w:r>
</w:p>
</w:txbxContent>
</v:textbox>
</v:shape>
</w:pict>
</w:r>
</#if>
<w:r> <w:r>
<w:rPr> <w:rPr>
<w:sz w:val="24"/> <w:sz w:val="24"/>
...@@ -1037,7 +1092,7 @@ ...@@ -1037,7 +1092,7 @@
<w:sz w:val="24"/> <w:sz w:val="24"/>
</w:rPr> </w:rPr>
<w:pict> <w:pict>
<v:shape id="文本框 12" o:spid="_x0000_s1035" o:spt="202" type="#_x0000_t202" style="position:absolute;left:0pt;margin-left:264.05pt;margin-top:400.65pt;height:149.25pt;width:137.1pt;z-index:251663360;mso-width-relative:page;mso-height-relative:page;" fillcolor="#FFFFFF" filled="t" stroked="f" coordsize="21600,21600"> <v:shape id="文本框 12" o:spid="_x0000_s1035" o:spt="202" type="#_x0000_t202" style="position:absolute;left:0pt;margin-left:264.05pt;margin-top:400pt;height:220pt;width:137.1pt;z-index:251663360;mso-width-relative:page;mso-height-relative:page;" fillcolor="#FFFFFF" filled="t" stroked="f" coordsize="21600,21600">
<v:path/> <v:path/>
<v:fill on="t" color2="#FFFFFF" focussize="0,0"/> <v:fill on="t" color2="#FFFFFF" focussize="0,0"/>
<v:stroke on="f" weight="0.5pt"/> <v:stroke on="f" weight="0.5pt"/>
...@@ -1431,6 +1486,128 @@ ...@@ -1431,6 +1486,128 @@
<w:t>号：</w:t> <w:t>号：</w:t>
</w:r> </w:r>
</w:p> </w:p>
<#if equListCode == "5000">
<w:p>
<w:pPr>
<w:keepNext w:val="off"/>
<w:keepLines w:val="off"/>
<w:pageBreakBefore w:val="off"/>
<w:widowControl/>
<w:kinsoku w:val="off"/>
<w:wordWrap/>
<w:overflowPunct/>
<w:topLinePunct w:val="off"/>
<w:autoSpaceDE w:val="off"/>
<w:autoSpaceDN w:val="off"/>
<w:adjustRightInd w:val="off"/>
<w:snapToGrid w:val="off"/>
<w:spacing w:before="160" w:line="408" w:line-rule="auto"/>
<w:jc w:val="left"/>
<w:textAlignment w:val="baseline"/>
<w:rPr>
<w:rFonts w:ascii="黑体" w:h-ansi="黑体" w:fareast="黑体" w:cs="黑体" w:hint="default"/>
<w:snapToGrid w:val="off"/>
<w:color w:val="000000"/>
<w:spacing w:val="-16"/>
<w:kern w:val="0"/>
<w:sz w:val="36"/>
<w:sz-cs w:val="36"/>
<w:lang w:val="EN-US" w:fareast="ZH-CN" w:bidi="AR-SA"/>
</w:rPr>
</w:pPr>
<w:r>
<w:rPr>
<w:rFonts w:ascii="黑体" w:h-ansi="黑体" w:fareast="黑体" w:cs="黑体" w:hint="default"/>
<w:snapToGrid w:val="off"/>
<w:color w:val="000000"/>
<w:spacing w:val="-16"/>
<w:kern w:val="0"/>
<w:sz w:val="36"/>
<w:sz-cs w:val="36"/>
<w:lang w:val="EN-US" w:fareast="EN-US" w:bidi="AR-SA"/>
</w:rPr>
<w:t>场(厂)</w:t>
</w:r>
<#-- <w:r>-->
<#-- <w:rPr>-->
<#-- <w:rFonts w:ascii="黑体" w:h-ansi="黑体" w:fareast="黑体" w:cs="黑体" w:hint="fareast"/>-->
<#-- <w:snapToGrid w:val="off"/>-->
<#-- <w:color w:val="000000"/>-->
<#-- <w:spacing w:val="-16"/>-->
<#-- <w:kern w:val="0"/>-->
<#-- <w:sz w:val="36"/>-->
<#-- <w:sz-cs w:val="36"/>-->
<#-- <w:lang w:val="EN-US" w:fareast="ZH-CN" w:bidi="AR-SA"/>-->
<#-- </w:rPr>-->
<#-- <w:t> </w:t>-->
<#-- </w:r>-->
<w:r>
<w:rPr>
<w:rFonts w:ascii="黑体" w:h-ansi="黑体" w:fareast="黑体" w:cs="黑体" w:hint="default"/>
<w:snapToGrid w:val="off"/>
<w:color w:val="000000"/>
<w:spacing w:val="-16"/>
<w:kern w:val="0"/>
<w:sz w:val="36"/>
<w:sz-cs w:val="36"/>
<w:lang w:val="EN-US" w:fareast="EN-US" w:bidi="AR-SA"/>
</w:rPr>
<w:t>车 </w:t>
</w:r>
<#-- <w:r>-->
<#-- <w:rPr>-->
<#-- <w:rFonts w:ascii="黑体" w:h-ansi="黑体" w:fareast="黑体" w:cs="黑体" w:hint="fareast"/>-->
<#-- <w:snapToGrid w:val="off"/>-->
<#-- <w:color w:val="000000"/>-->
<#-- <w:spacing w:val="-16"/>-->
<#-- <w:kern w:val="0"/>-->
<#-- <w:sz w:val="36"/>-->
<#-- <w:sz-cs w:val="36"/>-->
<#-- <w:lang w:val="EN-US" w:fareast="ZH-CN" w:bidi="AR-SA"/>-->
<#-- </w:rPr>-->
<#-- <w:t> </w:t>-->
<#-- </w:r>-->
<w:r>
<w:rPr>
<w:rFonts w:ascii="黑体" w:h-ansi="黑体" w:fareast="黑体" w:cs="黑体" w:hint="default"/>
<w:snapToGrid w:val="off"/>
<w:color w:val="000000"/>
<w:spacing w:val="-16"/>
<w:kern w:val="0"/>
<w:sz w:val="36"/>
<w:sz-cs w:val="36"/>
<w:lang w:val="EN-US" w:fareast="EN-US" w:bidi="AR-SA"/>
</w:rPr>
<w:t>牌 </w:t>
</w:r>
<#-- <w:r>-->
<#-- <w:rPr>-->
<#-- <w:rFonts w:ascii="黑体" w:h-ansi="黑体" w:fareast="黑体" w:cs="黑体" w:hint="fareast"/>-->
<#-- <w:snapToGrid w:val="off"/>-->
<#-- <w:color w:val="000000"/>-->
<#-- <w:spacing w:val="-16"/>-->
<#-- <w:kern w:val="0"/>-->
<#-- <w:sz w:val="36"/>-->
<#-- <w:sz-cs w:val="36"/>-->
<#-- <w:lang w:val="EN-US" w:fareast="ZH-CN" w:bidi="AR-SA"/>-->
<#-- </w:rPr>-->
<#-- <w:t> </w:t>-->
<#-- </w:r>-->
<w:r>
<w:rPr>
<w:rFonts w:ascii="黑体" w:h-ansi="黑体" w:fareast="黑体" w:cs="黑体" w:hint="default"/>
<w:snapToGrid w:val="off"/>
<w:color w:val="000000"/>
<w:spacing w:val="-16"/>
<w:kern w:val="0"/>
<w:sz w:val="36"/>
<w:sz-cs w:val="36"/>
<w:lang w:val="EN-US" w:fareast="EN-US" w:bidi="AR-SA"/>
</w:rPr>
<w:t>号：</w:t>
</w:r>
</w:p>
</#if>
</w:txbxContent> </w:txbxContent>
</v:textbox> </v:textbox>
</v:shape> </v:shape>
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/templates/use-registration-model.ftl
View file @ a0936cfd
...@@ -2,12 +2,10 @@ ...@@ -2,12 +2,10 @@
<?mso-application progid="Word.Document"?> <?mso-application progid="Word.Document"?>
<w:wordDocument xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml" xmlns:v="urn:schemas-microsoft-com:vml" <w:wordDocument xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml" xmlns:v="urn:schemas-microsoft-com:vml"
xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:w10="urn:schemas-microsoft-com:office:word"
xmlns:sl="http://schemas.microsoft.com/schemaLibrary/2003/core"
xmlns:aml="http://schemas.microsoft.com/aml/2001/core"
xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint" xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint"
xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882"
w:macrosPresent="no" w:embeddedObjPresent="no" w:ocxPresent="no" xml:space="preserve" w:macrosPresent="no" w:embeddedObjPresent="no" w:ocxPresent="no" xml:space="preserve"
xmlns:wpsCustomData="http://www.wps.cn/officeDocument/2013/wpsCustomData"><o:DocumentProperties> ><o:DocumentProperties>
<o:Author>光</o:Author> <o:Author>光</o:Author>
<o:LastAuthor>刘林</o:LastAuthor> <o:LastAuthor>刘林</o:LastAuthor>
<o:Revision>1</o:Revision> <o:Revision>1</o:Revision>
...@@ -567,7 +565,10 @@ ...@@ -567,7 +565,10 @@
<w:r> <w:r>
<w:pict> <w:pict>
<w:binData w:name="wordml://2.png">${(supervisoryCode)!''}</w:binData> <w:binData w:name="wordml://2.png">${(supervisoryCode)!''}</w:binData>
<v:shape id="图片 13" o:spid="_x0000_s1040" o:spt="75" alt="" type="#_x0000_t75" style="height:62.35pt;width:62.35pt;" filled="f" o:preferrelative="f" stroked="f" coordsize="21600,21600"> <v:shape id="图片 13" o:spid="_x0000_s1040" o:spt="75" alt=""
type="#_x0000_t75" style="height:62.35pt;width:62.35pt;"
filled="f" o:preferrelative="f" stroked="f"
coordsize="21600,21600">
<v:path/> <v:path/>
<v:fill on="f" focussize="0,0"/> <v:fill on="f" focussize="0,0"/>
<v:stroke on="f"/> <v:stroke on="f"/>
...@@ -746,6 +747,61 @@ ...@@ -746,6 +747,61 @@
</v:shape> </v:shape>
</w:pict> </w:pict>
</w:r> </w:r>
<#if equListCode == "5000">
<w:r>
<w:rPr>
<w:sz w:val="24"/>
</w:rPr>
<w:pict>
<v:shape id="文本框 17" o:spid="_x0000_s1028" o:spt="202" type="#_x0000_t202"
style="position:absolute;left:0pt;margin-left:392.7pt;margin-top:515pt;height:50pt;width:132.05pt;z-index:251668480;mso-width-relative:page;mso-height-relative:page;"
fillcolor="#FFFFFF" filled="t" stroked="f" coordsize="21600,21600">
<v:path/>
<v:fill on="t" color2="#FFFFFF" focussize="0,0"/>
<v:stroke on="f" weight="0.5pt"/>
<v:imagedata o:title=""/>
<o:lock v:ext="edit" aspectratio="f"/>
<v:textbox>
<w:txbxContent>
<w:p>
<w:pPr>
<w:keepNext w:val="off"/>
<w:keepLines w:val="off"/>
<w:pageBreakBefore w:val="off"/>
<w:widowControl w:val="off"/>
<w:kinsoku/>
<w:wordWrap/>
<w:overflowPunct/>
<w:topLinePunct w:val="off"/>
<w:adjustRightInd/>
<w:snapToGrid/>
<w:spacing w:line="120" w:line-rule="auto"/>
<w:textAlignment w:val="auto"/>
<w:rPr>
<w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:fareast="宋体" w:cs="宋体"
w:hint="fareast"/>
<w:sz w:val="24"/>
<w:sz-cs w:val="24"/>
<w:lang w:fareast="ZH-CN"/>
</w:rPr>
</w:pPr>
<w:r>
<w:rPr>
<w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:fareast="宋体" w:cs="宋体"
w:hint="fareast"/>
<w:sz w:val="24"/>
<w:sz-cs w:val="24"/>
<w:lang w:fareast="ZH-CN"/>
</w:rPr>
<w:t>${carNumber}</w:t>
</w:r>
</w:p>
</w:txbxContent>
</v:textbox>
</v:shape>
</w:pict>
</w:r>
</#if>
<w:r> <w:r>
<w:rPr> <w:rPr>
<w:sz w:val="24"/> <w:sz w:val="24"/>
......
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/controller/DPSubController.java
View file @ a0936cfd
...@@ -51,6 +51,9 @@ public class DPSubController { ...@@ -51,6 +51,9 @@ public class DPSubController {
if (ValidationUtil.isEmpty(param.get("equList"))){ if (ValidationUtil.isEmpty(param.get("equList"))){
param.put("equList", param.get("EQU_LIST_CODE")); param.put("equList", param.get("EQU_LIST_CODE"));
} }
if (ValidationUtil.isEmpty(param.get("PRODUCT_NAME"))){
param.put("PRODUCT_NAME", param.get("EQU_LIST"));
}
if (!ValidationUtil.isEmpty(param.get("equListCode"))){ // 问题列表关联设备 if (!ValidationUtil.isEmpty(param.get("equListCode"))){ // 问题列表关联设备
param.put("equList", param.get("equListCode")); param.put("equList", param.get("equListCode"));
param.put("EQU_LIST_CODE", param.get("equListCode")); param.put("EQU_LIST_CODE", param.get("equListCode"));
......
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/mapper/TzsUserPermissionMapper.java 0 → 100644
View file @ a0936cfd
package com.yeejoin.amos.boot.module.tcm.api.mapper;
import com.yeejoin.amos.boot.module.common.api.entity.TzsUserPermission;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* 用户资质信息表 Mapper 接口
*
* @author system_generator
* @date 2024-08-27
*/
public interface TzsUserPermissionMapper extends BaseMapper<TzsUserPermission> {
}
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/service/ITzsUserPermissionService.java 0 → 100644
View file @ a0936cfd
package com.yeejoin.amos.boot.module.tcm.api.service;
/**
* 用户资质信息表接口类
*
* @author system_generator
* @date 2024-08-27
*/
public interface ITzsUserPermissionService {
}
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/resources/mapper/TzsUserPermissionMapper.xml 0 → 100644
View file @ a0936cfd
<?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.TzsUserPermissionMapper">
</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/TzsUserPermissionController.java 0 → 100644
View file @ a0936cfd
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.TzsUserPermissionServiceImpl;
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.common.api.dto.TzsUserPermissionDto;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
/**
* 用户资质信息表
*
* @author system_generator
* @date 2024-08-27
*/
@RestController
@Api(tags = "用户资质信息表Api")
@RequestMapping(value = "/tzs-user-permission")
public class TzsUserPermissionController extends BaseController {
@Autowired
TzsUserPermissionServiceImpl tzsUserPermissionServiceImpl;
/**
* 新增用户资质信息表
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/save")
@ApiOperation(httpMethod = "POST", value = "新增用户资质信息表", notes = "新增用户资质信息表")
public ResponseModel<TzsUserPermissionDto> save(@RequestBody TzsUserPermissionDto model) {
model = tzsUserPermissionServiceImpl.createWithModel(model);
return ResponseHelper.buildResponse(model);
}
/**
* 根据sequenceNbr更新
*
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新用户资质信息表", notes = "根据sequenceNbr更新用户资质信息表")
public ResponseModel<TzsUserPermissionDto> updateBySequenceNbrTzsUserPermission(@RequestBody TzsUserPermissionDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
model.setSequenceNbr(sequenceNbr);
return ResponseHelper.buildResponse(tzsUserPermissionServiceImpl.updateWithModel(model));
}
/**
* 根据sequenceNbr删除
*
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@DeleteMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除用户资质信息表", notes = "根据sequenceNbr删除用户资质信息表")
public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
return ResponseHelper.buildResponse(tzsUserPermissionServiceImpl.removeById(sequenceNbr));
}
/**
* 根据sequenceNbr查询
*
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个用户资质信息表", notes = "根据sequenceNbr查询单个用户资质信息表")
public ResponseModel<TzsUserPermissionDto> selectOne(@PathVariable Long sequenceNbr) {
return ResponseHelper.buildResponse(tzsUserPermissionServiceImpl.queryBySeq(sequenceNbr));
}
/**
* 列表分页查询
*
* @param current 当前页
* @param current 每页大小
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/page")
@ApiOperation(httpMethod = "GET",value = "用户资质信息表分页查询", notes = "用户资质信息表分页查询")
public ResponseModel<Page<TzsUserPermissionDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
(value = "size") int size) {
Page<TzsUserPermissionDto> page = new Page<TzsUserPermissionDto>();
page.setCurrent(current);
page.setSize(size);
return ResponseHelper.buildResponse(tzsUserPermissionServiceImpl.queryForTzsUserPermissionPage(page));
}
/**
* 列表全部数据查询
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "用户资质信息表列表全部数据查询", notes = "用户资质信息表列表全部数据查询")
@GetMapping(value = "/list")
public ResponseModel<List<TzsUserPermissionDto>> selectForList() {
return ResponseHelper.buildResponse(tzsUserPermissionServiceImpl.queryForTzsUserPermissionList());
}
}
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/TzsUserPermissionServiceImpl.java 0 → 100644
View file @ a0936cfd
package com.yeejoin.amos.boot.module.tcm.biz.service.impl;
import com.yeejoin.amos.boot.module.common.api.entity.TzsUserPermission;
import com.yeejoin.amos.boot.module.tcm.api.mapper.TzsUserPermissionMapper;
import com.yeejoin.amos.boot.module.tcm.api.service.ITzsUserPermissionService;
import com.yeejoin.amos.boot.module.common.api.dto.TzsUserPermissionDto;
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 2024-08-27
*/
@Service
public class TzsUserPermissionServiceImpl extends BaseService<TzsUserPermissionDto,TzsUserPermission,TzsUserPermissionMapper> implements ITzsUserPermissionService {
/**
* 分页查询
*/
public Page<TzsUserPermissionDto> queryForTzsUserPermissionPage(Page<TzsUserPermissionDto> page) {
return this.queryForPage(page, null, false);
}
/**
* 列表查询 示例
*/
public List<TzsUserPermissionDto> queryForTzsUserPermissionList() {
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