Skip to content

A
amos-boot-biz
Commit 9e2af12d authored by suhuiguang's avatar suhuiguang
Browse files
Options

Merge branch 'temp' into develop_tzs_bugfix

parents 55fddbff 477a2e37
Hide whitespace changes
Inline Side-by-side
Showing with 134 additions and 30 deletions
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 @ 9e2af12d
......@@ -149,12 +149,16 @@ public class CommonController extends BaseController {
String companyType = selectedOrgInfo.getCompany().getCompanyType();
if ("个人主体".equals(companyType)) {
String[] code = selectedOrgInfo.getCompany().getCompanyCode().split("_");
map.put("useUnitCreditCode", code.length > 1 ? code[1] : code[0]);
String useUnitCode = code.length > 1 ? code[1] : code[0];
map.put("useUnitCreditCode", useUnitCode);
String[] companyName = selectedOrgInfo.getCompany().getCompanyName().split("_");
map.put("useUnitName", companyName.length > 1 ? companyName[1] : companyName[0]);
map.put("address", commonService.getEnterpriseInfo(useUnitCode).get("address"));
map.put("companyType", "person");
} else {
map.put("useUnitCreditCode", selectedOrgInfo.getCompany().getCompanyCode());
map.put("useUnitName", selectedOrgInfo.getCompany().getCompanyName());
map.put("companyType", "company");
}
return ResponseHelper.buildResponse(map);
}
......
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/dto/BasePersonRegisterDto.java
View file @ 9e2af12d
......@@ -85,8 +85,6 @@ public class BasePersonRegisterDto extends BaseDto {
@ApiModelProperty(value = "管理员身份证号")
private String adminIdNumber;
// @ApiModelProperty(value = "个人基本信息")
// private TzsBaseIndividualityDto baseIndividualityDto;
@ApiModelProperty(value = "平台公司id,平台创建公司后更新")
private String amosCompanySeq;
......@@ -94,4 +92,7 @@ public class BasePersonRegisterDto extends BaseDto {
@ApiModelProperty(value = "平台用户id,平台创建用户后更新")
private String adminUserId;
@ApiModelProperty(value = "住所")
private String address;
}
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/TzsBaseIndividualityServiceImpl.java
View file @ 9e2af12d
......@@ -75,6 +75,7 @@ public class TzsBaseIndividualityServiceImpl extends BaseService<TzsBaseIndividu
companyInfo.setCompanyName(dto.getCredentialsNum() + "_" + dto.getRealName());
companyInfo.setCompanyCode(dto.getUnitCode());
companyInfo.setCompanyType(unitType);
companyInfo.setAddress(dto.getAddress());
try {
FeignClientResult<CompanyModel> companyResult = Privilege.companyClient.create(companyInfo);
if (companyResult == null || companyResult.getResult() == null) {
......
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/flc/biz/service/impl/RegUnitInfoServiceImpl.java
View file @ 9e2af12d
......@@ -399,6 +399,7 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
if (type.equals(EnterpriseEnums.GR_ZT.getType())) {
baseEnterpriseInfo.setUseUnitCode(regUnitInfo.getUnitCode().split("_")[1]);
baseEnterpriseInfo.setAddress(regUnitInfo.getAddress());
} else {
baseEnterpriseInfo.setOfficeRegion(regUnitInfo.getOfficeRegion());
baseEnterpriseInfo.setOfficeAddress(regUnitInfo.getOfficeAddress());
......
amos-boot-system-tzs/amos-boot-module-ys/amos-boot-module-ys-api/src/main/java/com/yeejoin/amos/boot/module/ys/api/dto/YsEmergencyPlanDto.java
View file @ 9e2af12d
package com.yeejoin.amos.boot.module.ys.api.dto;
import com.alibaba.fastjson.JSONArray;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
......@@ -23,7 +25,7 @@ public class YsEmergencyPlanDto extends BaseDto {
@ApiModelProperty(value = "关联对象id")
private Integer businessId;
private String businessId;
@ApiModelProperty(value = "关联对象类型")
private String type;
......@@ -38,12 +40,13 @@ public class YsEmergencyPlanDto extends BaseDto {
private String planName;
@ApiModelProperty(value = "预案文件")
private String planFile;
private JSONArray planFile;
@ApiModelProperty(value = "预案类别id")
private Integer planCategoryId;
private String planCategoryId;
@ApiModelProperty(value = "预案时间")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date planTime;
@ApiModelProperty(value = "创建时间")
......
amos-boot-system-tzs/amos-boot-module-ys/amos-boot-module-ys-api/src/main/java/com/yeejoin/amos/boot/module/ys/api/entity/YsEmergencyPlan.java
View file @ 9e2af12d
......@@ -27,7 +27,7 @@ public class YsEmergencyPlan extends BaseEntity {
* 关联对象id
*/
@TableField("business_id")
private Integer businessId;
private String businessId;
/**
* 关联对象类型
......@@ -63,7 +63,7 @@ public class YsEmergencyPlan extends BaseEntity {
* 预案类别id
*/
@TableField("plan_category_id")
private Integer planCategoryId;
private String planCategoryId;
/**
* 预案时间
......
amos-boot-system-tzs/amos-boot-module-ys/amos-boot-module-ys-api/src/main/java/com/yeejoin/amos/boot/module/ys/api/mapper/YsEmergencyPlanMapper.java
View file @ 9e2af12d
package com.yeejoin.amos.boot.module.ys.api.mapper;
import com.yeejoin.amos.boot.module.ys.api.entity.YsEmergencyPlan;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.module.ys.api.dto.YsEmergencyPlanDto;
import com.yeejoin.amos.boot.module.ys.api.entity.YsEmergencyPlan;
import org.springframework.data.repository.query.Param;
/**
* 应急预案管理 Mapper 接口
......@@ -11,4 +14,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*/
public interface YsEmergencyPlanMapper extends BaseMapper<YsEmergencyPlan> {
Page<YsEmergencyPlanDto> queryForYsEmergencyPlanPage(@Param(value = "page") Page<YsEmergencyPlanDto> page,
@Param(value = "dto") YsEmergencyPlanDto dto);
}
amos-boot-system-tzs/amos-boot-module-ys/amos-boot-module-ys-api/src/main/java/com/yeejoin/amos/boot/module/ys/api/service/IYsEmergencyPlanService.java
View file @ 9e2af12d
package com.yeejoin.amos.boot.module.ys.api.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.module.ys.api.dto.YsEmergencyPlanDto;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
/**
* 应急预案管理接口类
*
* @author system_generator
* @date 2024-09-24
*/
public interface IYsEmergencyPlanService {}
public interface IYsEmergencyPlanService {
Page<YsEmergencyPlanDto> queryForYsEmergencyPlanPage(Page<YsEmergencyPlanDto> page,YsEmergencyPlanDto dto);
Boolean saveOrUpdate(YsEmergencyPlanDto dto, AgencyUserModel userModel);
YsEmergencyPlanDto detailBySeq(String sequenceNbr);
Boolean deleteBySeq(String sequenceNbr);
}
amos-boot-system-tzs/amos-boot-module-ys/amos-boot-module-ys-api/src/main/resources/mapper/YsEmergencyPlanMapper.xml
View file @ 9e2af12d
......@@ -2,4 +2,26 @@
<!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.ys.api.mapper.YsEmergencyPlanMapper">
<select id="queryForYsEmergencyPlanPage" resultType="com.yeejoin.amos.boot.module.ys.api.dto.YsEmergencyPlanDto">
select
*
FROM tzs_ys_emergency_plan tyep
<where>
tyep.is_delete = 0
<if test="dto != null ">
<if test="dto.planName != null and dto.planName != ''">
AND tyep.plan_name LIKE CONCAT('%', #{dto.planName}, '%')
</if>
<if test="dto.planCategory != null and dto.planCategory != ''">
AND tyep.plan_category LIKE CONCAT('%', #{dto.planCategory}, '%')
</if>
<if test="dto.planType != null and dto.planType != ''">
AND tyep.plan_type LIKE CONCAT('%', #{dto.planType}, '%')
</if>
</if>
</where>
ORDER BY
tyep.create_date DESC
</select>
</mapper>
amos-boot-system-tzs/amos-boot-module-ys/amos-boot-module-ys-biz/src/main/java/com/yeejoin/amos/boot/module/ys/biz/controller/YsEmergencyPlanController.java
View file @ 9e2af12d
......@@ -3,7 +3,9 @@ package com.yeejoin.amos.boot.module.ys.biz.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.module.ys.api.dto.YsEmergencyPlanDto;
import com.yeejoin.amos.boot.module.ys.api.service.IYsEmergencyPlanService;
import com.yeejoin.amos.boot.module.ys.biz.service.impl.YsEmergencyPlanServiceImpl;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -13,7 +15,6 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
/**
......@@ -26,20 +27,23 @@ import java.util.List;
@RequestMapping(value = "/ys-emergency-plan")
public class YsEmergencyPlanController extends BaseController {
@Autowired
IYsEmergencyPlanService iYsEmergencyPlanService;
@Autowired
YsEmergencyPlanServiceImpl ysEmergencyPlanServiceImpl;
/**
* 新增
* 新增或者更新接口
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/save")
@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
public ResponseModel<YsEmergencyPlanDto> save(@RequestBody YsEmergencyPlanDto model) {
model = ysEmergencyPlanServiceImpl.createWithModel(model);
return ResponseHelper.buildResponse(model);
@PostMapping(value = "/saveOrUpdate")
@ApiOperation(httpMethod = "POST", value = "新增或者更新接口", notes = "新增或者更新接口")
public ResponseModel<Boolean> saveOrUpdate(@RequestBody YsEmergencyPlanDto model) {
AgencyUserModel userModel = getSelectedOrgInfo().getUserModel();
return ResponseHelper.buildResponse(iYsEmergencyPlanService.saveOrUpdate(model,userModel));
}
/**
......@@ -63,10 +67,10 @@ public class YsEmergencyPlanController extends BaseController {
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@DeleteMapping(value = "/{sequenceNbr}")
@DeleteMapping(value = "/deleteBySeq")
@ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
return ResponseHelper.buildResponse(ysEmergencyPlanServiceImpl.removeById(sequenceNbr));
public ResponseModel<Boolean> deleteBySeq(@RequestParam (value = "sequenceNbr") String sequenceNbr){
return ResponseHelper.buildResponse(iYsEmergencyPlanService.deleteBySeq(sequenceNbr));
}
/**
......@@ -76,10 +80,10 @@ public class YsEmergencyPlanController extends BaseController {
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/{sequenceNbr}")
@GetMapping(value = "/detailBySeq")
@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个", notes = "根据sequenceNbr查询单个")
public ResponseModel<YsEmergencyPlanDto> selectOne(@PathVariable Long sequenceNbr) {
return ResponseHelper.buildResponse(ysEmergencyPlanServiceImpl.queryBySeq(sequenceNbr));
public ResponseModel<YsEmergencyPlanDto> detailBySeq(@RequestParam(value = "sequenceNbr") String sequenceNbr) {
return ResponseHelper.buildResponse(iYsEmergencyPlanService.detailBySeq(sequenceNbr));
}
/**
......@@ -92,12 +96,13 @@ public class YsEmergencyPlanController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/page")
@ApiOperation(httpMethod = "GET",value = "分页查询", notes = "分页查询")
public ResponseModel<Page<YsEmergencyPlanDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
(value = "size") int size) {
public ResponseModel<Page<YsEmergencyPlanDto>> queryForPage(@RequestParam(value = "current") int current,
@RequestParam(value = "size") int size,
YsEmergencyPlanDto dto) {
Page<YsEmergencyPlanDto> page = new Page<YsEmergencyPlanDto>();
page.setCurrent(current);
page.setSize(size);
return ResponseHelper.buildResponse(ysEmergencyPlanServiceImpl.queryForYsEmergencyPlanPage(page));
return ResponseHelper.buildResponse(iYsEmergencyPlanService.queryForYsEmergencyPlanPage(page,dto));
}
/**
......
amos-boot-system-tzs/amos-boot-module-ys/amos-boot-module-ys-biz/src/main/java/com/yeejoin/amos/boot/module/ys/biz/service/impl/YsEmergencyPlanServiceImpl.java
View file @ 9e2af12d
package com.yeejoin.amos.boot.module.ys.biz.service.impl;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.module.ys.api.dto.YsEmergencyPlanDto;
import com.yeejoin.amos.boot.module.ys.api.entity.YsEmergencyPlan;
import com.yeejoin.amos.boot.module.ys.api.mapper.YsEmergencyPlanMapper;
import com.yeejoin.amos.boot.module.ys.api.service.IYsEmergencyPlanService;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import java.util.Date;
import java.util.List;
/**
......@@ -17,18 +24,58 @@ import java.util.List;
* @date 2024-09-24
*/
@Service
public class YsEmergencyPlanServiceImpl extends BaseService<YsEmergencyPlanDto,YsEmergencyPlan,YsEmergencyPlanMapper> implements IYsEmergencyPlanService {
public class YsEmergencyPlanServiceImpl extends BaseService<YsEmergencyPlanDto, YsEmergencyPlan, YsEmergencyPlanMapper> implements IYsEmergencyPlanService {
@Autowired
private YsEmergencyPlanMapper ysEmergencyPlanMapper;
/**
* 分页查询
*/
public Page<YsEmergencyPlanDto> queryForYsEmergencyPlanPage(Page<YsEmergencyPlanDto> page) {
public Page<YsEmergencyPlanDto> queryForYsEmergencyPlanPage(Page<YsEmergencyPlanDto> page) {
return this.queryForPage(page, null, false);
}
/**
* 列表查询 示例
*/
public List<YsEmergencyPlanDto> queryForYsEmergencyPlanList() {
return this.queryForList("" , false);
public List<YsEmergencyPlanDto> queryForYsEmergencyPlanList() {
return this.queryForList("", false);
}
@Override
public Page<YsEmergencyPlanDto> queryForYsEmergencyPlanPage(Page<YsEmergencyPlanDto> page, YsEmergencyPlanDto dto) {
return ysEmergencyPlanMapper.queryForYsEmergencyPlanPage(page, dto);
}
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean saveOrUpdate(YsEmergencyPlanDto dto, AgencyUserModel userModel) {
YsEmergencyPlan emergencyPlan = new YsEmergencyPlan();
if (ValidationUtil.isEmpty(dto.getSequenceNbr())) {//新增
dto.setCreateDate(new Date());
dto.setCreateUserId(userModel.getUserId());
dto.setCreateUserName(userModel.getUserName());
}
emergencyPlan.setPlanFile(JSON.toJSONString(dto.getPlanFile()));
BeanUtils.copyProperties(dto, emergencyPlan);
return this.saveOrUpdate(emergencyPlan);
}
@Override
public YsEmergencyPlanDto detailBySeq(String sequenceNbr) {
YsEmergencyPlanDto emergencyPlanDto = new YsEmergencyPlanDto();
YsEmergencyPlan emergencyPlan = this.baseMapper.selectById(sequenceNbr);
BeanUtils.copyProperties(emergencyPlan, emergencyPlanDto);
emergencyPlanDto.setPlanFile(JSON.parseArray(emergencyPlan.getPlanFile()));
return emergencyPlanDto;
}
@Override
public Boolean deleteBySeq(String sequenceNbr) {
YsEmergencyPlan emergencyPlan = new YsEmergencyPlan();
emergencyPlan.setSequenceNbr(Long.valueOf(sequenceNbr));
emergencyPlan.setIsDelete(Boolean.TRUE);
return this.baseMapper.updateById(emergencyPlan) > 0;
}
}
\ 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