Skip to content

A
amos-boot-biz
Commit 5d383d1a authored by suhuiguang's avatar suhuiguang
Browse files
Options

Merge branch 'develop_tzs_register' of…

Merge branch 'develop_tzs_register' of http://36.40.66.175:5000/moa/amos-boot-biz into develop_tzs_register
parents 9f7eadaa 461e6030
Hide whitespace changes
Inline Side-by-side
Showing with 321 additions and 163 deletions
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/mapper/JyjcInspectionApplicationMapper.java
View file @ 5d383d1a
...@@ -7,8 +7,6 @@ import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationEqui ...@@ -7,8 +7,6 @@ import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationEqui
import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationModel; import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationModel;
import org.springframework.data.repository.query.Param; import org.springframework.data.repository.query.Param;
import java.util.List;
import java.util.Map;
/** /**
* Mapper 接口 * Mapper 接口
...@@ -27,4 +25,6 @@ public interface JyjcInspectionApplicationMapper extends BaseMapper<JyjcInspecti ...@@ -27,4 +25,6 @@ public interface JyjcInspectionApplicationMapper extends BaseMapper<JyjcInspecti
JyjcInspectionApplicationModel selectDataBySeq(Long sequenceNbr); JyjcInspectionApplicationModel selectDataBySeq(Long sequenceNbr);
void updatePromoter(@org.apache.ibatis.annotations.Param ("id") Long id); void updatePromoter(@org.apache.ibatis.annotations.Param ("id") Long id);
Page<JyjcInspectionApplicationModel> selectForPage(@Param("page") Page<JyjcInspectionApplication> page, @Param("jyjcInspectionApplicationModel") JyjcInspectionApplicationModel jyjcInspectionApplicationModel, @Param("identity") String identity, @Param("currentApplicationUnitCode") String currentApplicationUnitCode, @Param("currentInspectionUnitCode") String currentInspectionUnitCode);
} }
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/model/JyjcInspectionApplicationModel.java
View file @ 5d383d1a
...@@ -68,6 +68,7 @@ public class JyjcInspectionApplicationModel extends BaseModel { ...@@ -68,6 +68,7 @@ public class JyjcInspectionApplicationModel extends BaseModel {
private String originalApplicationNo; private String originalApplicationNo;
@ApiModelProperty(value = "受理日期") @ApiModelProperty(value = "受理日期")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date acceptDate; private Date acceptDate;
@ApiModelProperty(value = "报检单位编号") @ApiModelProperty(value = "报检单位编号")
......
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/service/IJyjcInspectionApplicationService.java
View file @ 5d383d1a
package com.yeejoin.amos.boot.module.jyjc.api.service; package com.yeejoin.amos.boot.module.jyjc.api.service;
import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationEquipModel; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionApplication;
import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationModel;
import java.util.List; import java.util.List;
...@@ -13,4 +15,5 @@ import java.util.List; ...@@ -13,4 +15,5 @@ import java.util.List;
public interface IJyjcInspectionApplicationService { public interface IJyjcInspectionApplicationService {
Boolean deleteBatchData(List<Long> sequenceNbr); Boolean deleteBatchData(List<Long> sequenceNbr);
Page<JyjcInspectionApplicationModel> queryForPageList(Page<JyjcInspectionApplication> page, JyjcInspectionApplicationModel model);
} }
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcInspectionApplicationMapper.xml
View file @ 5d383d1a
...@@ -79,6 +79,99 @@ ...@@ -79,6 +79,99 @@
</where> </where>
order by tzjia.application_no desc order by tzjia.application_no desc
</select> </select>
<select id="selectForPage" resultType="com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationModel">
SELECT
DISTINCT(tzjia.sequence_nbr),
tzjia.process_instance_id,
tzjia.workflow_node,
tzjia.biz_type,
tzjia.application_no,
cdd1.NAME AS inspectionClassify,
cdd3.NAME AS inspectionType,
tzjia.inspection_unit_code,
cdd.NAME AS equipClassify,
tzjia.number_of_equip,
tzjia.inspection_unit_code,
tzjia.application_date,
tzjia.accept_date,
tzjia.inspection_charge_phone,
tbei.use_unit AS applicationUnitName,
tbei1.use_unit AS inspectionUnitName,
tzjia.status,
cdd2.NAME AS statusName,
tzjia.next_execute_ids as nextExecuteIds,
tzjia.promoter,
tzjia.create_user_id,
tzjia.next_execute_user_ids as nextExecuteUserIds,
tzjia.inspection_charge_person as inspectionChargePerson
FROM
tz_jyjc_inspection_application AS tzjia
LEFT JOIN tz_base_enterprise_info tbei ON tbei.use_code = tzjia.application_unit_code
LEFT JOIN tz_base_enterprise_info tbei1 ON tbei1.use_code = tzjia.inspection_unit_code
LEFT JOIN cb_data_dictionary cdd ON cdd.code = tzjia.equip_classify and cdd.type = 'BJSBZL'
LEFT JOIN cb_data_dictionary cdd1 ON cdd1.code = tzjia.inspection_classify
LEFT JOIN cb_data_dictionary cdd2 ON cdd2.code = tzjia.status and cdd2.type = 'JYLCZT'
LEFT JOIN cb_data_dictionary cdd3 ON cdd3.code = tzjia.inspection_type
<where>
<if test="jyjcInspectionApplicationModel.applicationNo != null and jyjcInspectionApplicationModel.applicationNo != ''">
and tzjia.application_no like concat('%',#{jyjcInspectionApplicationModel.applicationNo},'%')
</if>
<if test="jyjcInspectionApplicationModel.inspectionClassify != null and jyjcInspectionApplicationModel.inspectionClassify != ''">
and tzjia.inspection_classify = #{jyjcInspectionApplicationModel.inspectionClassify}
</if>
<if test="jyjcInspectionApplicationModel.equipClassify != null and jyjcInspectionApplicationModel.equipClassify != ''">
and tzjia.equip_classify = #{jyjcInspectionApplicationModel.equipClassify}
</if>
<if test="jyjcInspectionApplicationModel.applicationDate != null and jyjcInspectionApplicationModel.applicationDate != ''">
and tzjia.application_date = #{jyjcInspectionApplicationModel.applicationDate}
</if>
<if test="jyjcInspectionApplicationModel.acceptDate != null and jyjcInspectionApplicationModel.acceptDate != ''">
and tzjia.accept_date = #{jyjcInspectionApplicationModel.acceptDate}
</if>
<if test="jyjcInspectionApplicationModel.inspectionChargePerson != null and jyjcInspectionApplicationModel.inspectionChargePerson != ''">
and tzjia.inspection_charge_person like concat('%',#{jyjcInspectionApplicationModel.inspectionChargePerson},'%')
</if>
<if test="jyjcInspectionApplicationModel.status != null and jyjcInspectionApplicationModel.status != ''">
and tzjia.status = #{jyjcInspectionApplicationModel.status}
</if>
<if test="jyjcInspectionApplicationModel.bizType != null and jyjcInspectionApplicationModel.bizType != ''">
and tzjia.biz_type = #{jyjcInspectionApplicationModel.bizType}
</if>
<if test="jyjcInspectionApplicationModel.inspectionUnitName != null and jyjcInspectionApplicationModel.inspectionUnitName != ''">
and tzjia.inspection_unit_code = (select use_code from tz_base_enterprise_info where use_unit like concat('%',#{jyjcInspectionApplicationModel.inspectionUnitName},'%'))
</if>
<if test="jyjcInspectionApplicationModel.applicationUnitName != null and jyjcInspectionApplicationModel.applicationUnitName != ''">
and tzjia.application_unit_code = (select use_code from tz_base_enterprise_info where use_unit like concat('%',#{jyjcInspectionApplicationModel.inspectionUnitName},'%'))
</if>
<if test="jyjcInspectionApplicationModel.inspectionUnitCode != null and jyjcInspectionApplicationModel.inspectionUnitCode != ''">
and tzjia.inspection_unit_code = #{jyjcInspectionApplicationModel.inspectionUnitCode} and tzjia.status != '6610'
</if>
<if test="jyjcInspectionApplicationModel.applicationUnitCode != null and jyjcInspectionApplicationModel.applicationUnitCode != ''">
and tzjia.application_unit_code = #{jyjcInspectionApplicationModel.applicationUnitCode}
</if>
<choose>
<when test="identity == 'apply'">
and tzjia.application_unit_code = #{currentApplicationUnitCode}
</when>
<when test="identity == 'receive'">
and tzjia.inspection_unit_code = #{currentInspectionUnitCode}
</when>
<when test="identity == 'all'">
and (tzjia.application_unit_code = #{currentApplicationUnitCode} or tzjia.inspection_unit_code = #{currentInspectionUnitCode})
</when>
<otherwise>
1=2
</otherwise>
</choose>
</where>
order by tzjia.application_no desc
</select>
<select id="listByCategory" <select id="listByCategory"
resultType="com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationEquipModel"> resultType="com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationEquipModel">
select select
......
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/controller/JyjcInspectionApplicationController.java
View file @ 5d383d1a
...@@ -10,6 +10,7 @@ import com.yeejoin.amos.boot.module.common.biz.utils.CommonResponseUtil; ...@@ -10,6 +10,7 @@ import com.yeejoin.amos.boot.module.common.biz.utils.CommonResponseUtil;
import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionApplication; import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionApplication;
import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationEquipModel; import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationEquipModel;
import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationModel; import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationModel;
import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionResultModel;
import com.yeejoin.amos.boot.module.jyjc.biz.config.BaseException; import com.yeejoin.amos.boot.module.jyjc.biz.config.BaseException;
import com.yeejoin.amos.boot.module.jyjc.biz.service.impl.JyjcInspectionApplicationServiceImpl; import com.yeejoin.amos.boot.module.jyjc.biz.service.impl.JyjcInspectionApplicationServiceImpl;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
...@@ -28,8 +29,6 @@ import java.util.List; ...@@ -28,8 +29,6 @@ import java.util.List;
import java.util.Map; import java.util.Map;
/** /**
*
*
* @author system_generator * @author system_generator
* @date 2023-12-14 * @date 2023-12-14
*/ */
...@@ -90,185 +89,200 @@ public class JyjcInspectionApplicationController extends BaseController { ...@@ -90,185 +89,200 @@ public class JyjcInspectionApplicationController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@DeleteMapping(value = "/{sequenceNbr}") @DeleteMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除") @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){ public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.removeById(sequenceNbr)); return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.removeById(sequenceNbr));
} }
/**
* 根据sequenceNbr删除
*
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@DeleteMapping(value = "/deleteBatch")
@ApiOperation(httpMethod = "DELETE", value = "批量删除", notes = "批量删除")
public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @RequestParam List<Long> sequenceNbr) {
/** return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.deleteBatchData(sequenceNbr));
* 根据sequenceNbr删除 }
*
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@DeleteMapping(value = "/deleteBatch")
@ApiOperation(httpMethod = "DELETE", value = "批量删除", notes = "批量删除")
public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @RequestParam List<Long>sequenceNbr){
return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.deleteBatchData(sequenceNbr));
}
/** /**
* 根据sequenceNbr查询 * 根据sequenceNbr查询
* *
* @param sequenceNbr 主键 * @param sequenceNbr 主键
* @return * @return
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/{sequenceNbr}") @GetMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个", notes = "根据sequenceNbr查询单个") @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个", notes = "根据sequenceNbr查询单个")
public ResponseModel<Map<String,Object>> selectOne(@PathVariable Long sequenceNbr) { public ResponseModel<Map<String, Object>> selectOne(@PathVariable Long sequenceNbr) {
return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.selectBySeq(sequenceNbr)); return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.selectBySeq(sequenceNbr));
} }
/** /**
* 列表分页查询 * 列表分页查询
* *
* @param current 当前页 * @param current 当前页
* @param current 每页大小 * @param current 每页大小
* @return * @return
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/pageByInstitution") @GetMapping(value = "/pageByInstitution")
@ApiOperation(httpMethod = "GET",value = "分页查询（检验机构）", notes = "分页查询（检验机构）") @ApiOperation(httpMethod = "GET", value = "分页查询（检验机构）", notes = "分页查询（检验机构）")
public ResponseModel<Page<JyjcInspectionApplicationModel>> queryForPageByInstitution(@RequestParam(value = "current") int current,@RequestParam public ResponseModel<Page<JyjcInspectionApplicationModel>> queryForPageByInstitution(@RequestParam(value = "current") int current,
(value = "size") int size,@RequestParam(required = false) String applicationNo, @RequestParam(value = "size") int size,
@RequestParam(required = false) String inspectionClassify, @RequestParam(required = false) String applicationNo,
@RequestParam(required = false) String applicationUnitCode, @RequestParam(required = false) String inspectionClassify,
@RequestParam(required = false) String applicationUnitName, @RequestParam(required = false) String applicationUnitCode,
@RequestParam(required = false) String inspectionUnitName, @RequestParam(required = false) String applicationUnitName,
@RequestParam(required = false) String equipClassify, @RequestParam(required = false) String inspectionUnitName,
@RequestParam(required = false) String inspectionUnitCode, @RequestParam(required = false) String equipClassify,
@RequestParam(required = false) String applicationDate, @RequestParam(required = false) String inspectionUnitCode,
@RequestParam(required = false) String acceptDate, @RequestParam(required = false) String applicationDate,
@RequestParam(required = false) String inspectionChargePerson, @RequestParam(required = false) String acceptDate,
@RequestParam(required = false) String status , @RequestParam(required = false) String inspectionChargePerson,
@RequestParam(required = false) String roles, String bizType) { @RequestParam(required = false) String status,
Page<JyjcInspectionApplication> page = new Page<JyjcInspectionApplication>(); @RequestParam(required = false) String roles, String bizType) {
page.setCurrent(current); Page<JyjcInspectionApplication> page = new Page<JyjcInspectionApplication>();
page.setSize(size); page.setCurrent(current);
page.setSize(size);
ReginParams reginParams = getSelectedOrgInfo();
inspectionUnitCode = reginParams.getCompany().getCompanyCode();
List<String> roleIds = StrUtil.split(roles, ",");
ReginParams reginParams = getSelectedOrgInfo(); return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.queryForJyjcInspectionApplicationPage(page, applicationNo, inspectionClassify, applicationUnitCode, equipClassify, inspectionUnitCode, applicationUnitName, inspectionUnitName, applicationDate, acceptDate, inspectionChargePerson, status, bizType));
inspectionUnitCode = reginParams.getCompany().getCompanyCode(); }
List<String> roleIds = StrUtil.split(roles, ",");
return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.queryForJyjcInspectionApplicationPage(page,applicationNo,inspectionClassify,applicationUnitCode,equipClassify,inspectionUnitCode,applicationUnitName,inspectionUnitName,applicationDate,acceptDate,inspectionChargePerson,status,bizType ));
}
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/pageByCompany") @GetMapping(value = "/pageByCompany")
@ApiOperation(httpMethod = "GET",value = "分页查询（报检单位）", notes = "分页查询（报检单位）") @ApiOperation(httpMethod = "GET", value = "分页查询（报检单位）", notes = "分页查询（报检单位）")
public ResponseModel<Page<JyjcInspectionApplicationModel>> queryForPageByCompany(@RequestParam(value = "current") int current,@RequestParam public ResponseModel<Page<JyjcInspectionApplicationModel>> queryForPageByCompany(@RequestParam(value = "current") int current,
(value = "size") int size,@RequestParam(required = false) String applicationNo, @RequestParam (value = "size") int size,
@RequestParam(required = false) String inspectionClassify, @RequestParam(required = false) String applicationNo,
@RequestParam(required = false) String applicationUnitCode, @RequestParam(required = false) String inspectionClassify,
@RequestParam(required = false) String equipClassify, @RequestParam(required = false) String applicationUnitCode,
@RequestParam(required = false) String inspectionUnitCode, @RequestParam(required = false) String equipClassify,
@RequestParam(required = false) String applicationUnitName, @RequestParam(required = false) String inspectionUnitCode,
@RequestParam(required = false) String inspectionUnitName, @RequestParam(required = false) String applicationUnitName,
@RequestParam(required = false) String applicationDate, @RequestParam(required = false) String inspectionUnitName,
@RequestParam(required = false) String acceptDate, @RequestParam(required = false) String applicationDate,
@RequestParam(required = false) String inspectionChargePerson, @RequestParam(required = false) String acceptDate,
@RequestParam(required = false) String roles, @RequestParam(required = false) String inspectionChargePerson,
@RequestParam(required = false) String status , String bizType) { @RequestParam(required = false) String roles,
Page<JyjcInspectionApplication> page = new Page<JyjcInspectionApplication>(); @RequestParam(required = false) String status, String bizType) {
page.setCurrent(current); Page<JyjcInspectionApplication> page = new Page<JyjcInspectionApplication>();
page.setSize(size); page.setCurrent(current);
ReginParams reginParams = getSelectedOrgInfo(); page.setSize(size);
applicationUnitCode = reginParams.getCompany().getCompanyCode(); ReginParams reginParams = getSelectedOrgInfo();
List<String> roleIds = StrUtil.split(roles, ","); applicationUnitCode = reginParams.getCompany().getCompanyCode();
List<String> roleIds = StrUtil.split(roles, ",");
// return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.queryForJyjcInspectionApplicationPage(page,applicationNo,inspectionClassify,applicationUnitCode,equipClassify,inspectionUnitCode,applicationUnitName,inspectionUnitName,applicationDate,acceptDate,inspectionChargePerson,status,bizType,roleIds)); // return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.queryForJyjcInspectionApplicationPage(page,applicationNo,inspectionClassify,applicationUnitCode,equipClassify,inspectionUnitCode,applicationUnitName,inspectionUnitName,applicationDate,acceptDate,inspectionChargePerson,status,bizType,roleIds));
return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.queryForJyjcInspectionApplicationPage(page,applicationNo,inspectionClassify,applicationUnitCode,equipClassify,inspectionUnitCode,applicationUnitName,inspectionUnitName,applicationDate,acceptDate,inspectionChargePerson,status,bizType)); return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.queryForJyjcInspectionApplicationPage(page, applicationNo, inspectionClassify, applicationUnitCode, equipClassify, inspectionUnitCode, applicationUnitName, inspectionUnitName, applicationDate, acceptDate, inspectionChargePerson, status, bizType));
} }
/**
* 列表全部数据查询
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "列表全部数据查询", notes = "列表全部数据查询")
@GetMapping(value = "/list")
public ResponseModel<List<JyjcInspectionApplicationModel>> selectForList() {
return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.queryForJyjcInspectionApplicationList());
}
/** @TycloudOperation(ApiLevel = UserType.AGENCY)
* 接收接口 @PostMapping(value = "/pageList")
* @ApiOperation(httpMethod = "POST", value = "分页列表页面(检验检测单位、使用单位共用）", notes = "分页列表页面(检验检测单位、使用单位共用）")
* public ResponseModel<Page<JyjcInspectionApplicationModel>> queryForPageList(@RequestParam(value = "current") int current,
* @param params params @RequestParam(value = "size") int size,
* @return {@link ResponseModel< HashMap< String String>>} @RequestBody JyjcInspectionApplicationModel model) {
* @author yangyang Page<JyjcInspectionApplication> page = new Page<JyjcInspectionApplication>();
* @throws page.setCurrent(current);
* @date 2023/12/15 11:25 page.setSize(size);
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "POST",value = "接收", notes = "接收")
@PostMapping(value = "/flow/{type}/receive")
public ResponseModel<HashMap<String, String>> execueFlow(@PathVariable(value = "type") String type, @RequestBody Map<String, Object> params) {
params.put("type", type);
try {
jyjcInspectionApplicationServiceImpl.doReceive(params);
}catch (Exception e){
return CommonResponseUtil.failure("该项流程发生变化，请返回列表刷新查看状态后重试");
}
HashMap<String, String> result = new HashMap<>();
result.put("result","success");
return ResponseHelper.buildResponse(result);
}
/** return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.queryForPageList(page, model));
* 退回接口（监督检验、定（首）检、检测）-通用
*
*
* @param params params
* @return {@link }
* @author yangyang
* @throws
* @date 2023/12/15 13:44
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "退回", notes = "退回")
@PostMapping(value = "/flow/reject")
public ResponseModel<Boolean> doRejectFlow(@RequestBody Map<String,Object> params) {
return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.doReject(params));
}
/** }
* 撤回接口（监督检验、定（首）检、检测）-通用
* /**
* * 列表全部数据查询
* @param sequenceNbr sequenceNbr *
* @return {@link } * @return
* @author yangyang */
* @throws @TycloudOperation(ApiLevel = UserType.AGENCY)
* @date 2023/12/15 13:39 @ApiOperation(httpMethod = "GET", value = "列表全部数据查询", notes = "列表全部数据查询")
*/ @GetMapping(value = "/list")
@TycloudOperation(ApiLevel = UserType.AGENCY) public ResponseModel<List<JyjcInspectionApplicationModel>> selectForList() {
@ApiOperation(httpMethod = "GET",value = "撤回", notes = "撤回") return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.queryForJyjcInspectionApplicationList());
@GetMapping(value = "/flow/rollback") }
public ResponseModel<Boolean> doRollbackFlow(@RequestParam("sequenceNbr") String sequenceNbr) {
return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.doRollback(sequenceNbr)); /**
} * 接收接口
/** *
* 查询指定设备种类的设备列表 * @param params params
* * @return {@link ResponseModel< HashMap< String String>>}
* @return * @throws
*/ * @author yangyang
@TycloudOperation(ApiLevel = UserType.AGENCY) * @date 2023/12/15 11:25
@ApiOperation(httpMethod = "GET",value = "查询指定设备种类的设备列表", notes = "查询指定设备种类的设备列表") */
@GetMapping(value = "/listByCategory") @TycloudOperation(ApiLevel = UserType.AGENCY)
public ResponseModel<Page<JyjcInspectionApplicationEquipModel>> listByCategory( @ApiOperation(httpMethod = "POST", value = "接收", notes = "接收")
@RequestParam("current") int current, @PostMapping(value = "/flow/{type}/receive")
@RequestParam("size") int size, public ResponseModel<HashMap<String, String>> execueFlow(@PathVariable(value = "type") String type, @RequestBody Map<String, Object> params) {
@RequestParam("equipClassify") String equipClassify) { params.put("type", type);
Page<JyjcInspectionApplicationEquipModel> page = new Page<>(); try {
page.setCurrent(current); jyjcInspectionApplicationServiceImpl.doReceive(params);
page.setSize(size); } catch (Exception e) {
return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.listByCategory(page,equipClassify)); return CommonResponseUtil.failure("该项流程发生变化，请返回列表刷新查看状态后重试");
} }
HashMap<String, String> result = new HashMap<>();
result.put("result", "success");
return ResponseHelper.buildResponse(result);
}
/**
* 退回接口（监督检验、定（首）检、检测）-通用
*
* @param params params
* @return {@link }
* @throws
* @author yangyang
* @date 2023/12/15 13:44
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "退回", notes = "退回")
@PostMapping(value = "/flow/reject")
public ResponseModel<Boolean> doRejectFlow(@RequestBody Map<String, Object> params) {
return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.doReject(params));
}
/**
* 撤回接口（监督检验、定（首）检、检测）-通用
*
* @param sequenceNbr sequenceNbr
* @return {@link }
* @throws
* @author yangyang
* @date 2023/12/15 13:39
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "撤回", notes = "撤回")
@GetMapping(value = "/flow/rollback")
public ResponseModel<Boolean> doRollbackFlow(@RequestParam("sequenceNbr") String sequenceNbr) {
return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.doRollback(sequenceNbr));
}
/**
* 查询指定设备种类的设备列表
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "查询指定设备种类的设备列表", notes = "查询指定设备种类的设备列表")
@GetMapping(value = "/listByCategory")
public ResponseModel<Page<JyjcInspectionApplicationEquipModel>> listByCategory(
@RequestParam("current") int current,
@RequestParam("size") int size,
@RequestParam("equipClassify") String equipClassify) {
Page<JyjcInspectionApplicationEquipModel> page = new Page<>();
page.setCurrent(current);
page.setSize(size);
return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.listByCategory(page, equipClassify));
}
} }
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcInspectionApplicationServiceImpl.java
View file @ 5d383d1a
...@@ -16,7 +16,6 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisKey; ...@@ -16,7 +16,6 @@ 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.biz.common.workflow.feign.WorkflowFeignService; import com.yeejoin.amos.boot.biz.common.workflow.feign.WorkflowFeignService;
import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto; import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
import com.yeejoin.amos.boot.module.common.biz.utils.CommonResponseUtil;
import com.yeejoin.amos.boot.module.jyjc.api.entity.*; import com.yeejoin.amos.boot.module.jyjc.api.entity.*;
import com.yeejoin.amos.boot.module.jyjc.api.enums.BizTypeEnum; import com.yeejoin.amos.boot.module.jyjc.api.enums.BizTypeEnum;
import com.yeejoin.amos.boot.module.jyjc.api.enums.BusinessTypeEnum; import com.yeejoin.amos.boot.module.jyjc.api.enums.BusinessTypeEnum;
...@@ -33,8 +32,6 @@ import com.yeejoin.amos.boot.module.jyjc.biz.service.impl.handler.JyjcInspection ...@@ -33,8 +32,6 @@ import com.yeejoin.amos.boot.module.jyjc.biz.service.impl.handler.JyjcInspection
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.FlowStatusEnum; import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
import com.yeejoin.amos.component.feign.model.FeignClientResult; import com.yeejoin.amos.component.feign.model.FeignClientResult;
import com.yeejoin.amos.component.feign.utils.FeignUtil;
import com.yeejoin.amos.feign.privilege.Privilege;
import com.yeejoin.amos.feign.systemctl.model.TaskV2Model; import com.yeejoin.amos.feign.systemctl.model.TaskV2Model;
import com.yeejoin.amos.feign.workflow.Workflow; import com.yeejoin.amos.feign.workflow.Workflow;
import com.yeejoin.amos.feign.workflow.model.*; import com.yeejoin.amos.feign.workflow.model.*;
...@@ -53,7 +50,6 @@ import org.typroject.tyboot.core.foundation.context.RequestContext; ...@@ -53,7 +50,6 @@ import org.typroject.tyboot.core.foundation.context.RequestContext;
import org.typroject.tyboot.core.foundation.exception.BaseException; import org.typroject.tyboot.core.foundation.exception.BaseException;
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.exception.instance.BadRequest;
import java.io.IOException; import java.io.IOException;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
...@@ -382,6 +378,57 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec ...@@ -382,6 +378,57 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
} }
public Page<JyjcInspectionApplicationModel> queryForPageList(Page<JyjcInspectionApplication> page, JyjcInspectionApplicationModel model) {
ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(),
RequestContext.getToken())).toString(), ReginParams.class);
String companyType = reginParams.getCompany().getCompanyType();
String companyCode = reginParams.getCompany().getCompanyCode();
String currentApplicationUnitCode = null;
String currentInspectionUnitCode = null;
if(ValidationUtil.isEmpty(companyType)){
return new Page<>(0,10, 0);
}
// 判断当前登录人身份（报检机构、接收机构、即时报检又是接收机构、都不是（不存在此情况））
String identity= this.getCompanyIdentityByType(reginParams.getCompany().getCompanyType());
if(ValidationUtil.equals("apply", identity)){
currentApplicationUnitCode = companyCode;
}
if(ValidationUtil.equals("receive", identity)){
currentInspectionUnitCode = companyCode;
}
if(ValidationUtil.equals("all", identity)){
currentApplicationUnitCode = companyCode;
currentInspectionUnitCode = companyCode;
}
Page<JyjcInspectionApplicationModel> resultPage = this.getBaseMapper().selectForPage(page, model, identity, currentApplicationUnitCode, currentInspectionUnitCode);
return resultPage;
}
private String getCompanyIdentityByType(String companyType){
// 可发起单位的单位类型（角色与单位类型已绑定，在业务系统增加的账号不会出现角色与的单位类型不匹配场景）
String[] applyIdentityDefine = {"使用单位", "安装改造维修单位"};
// 可进行检验检测申请接收的单位类型，在业务系统增加的账号不会出现角色与的单位类型不匹配场景
String[] receiveIdentityDefine = {"检验检测机构"};
boolean isApplyIdentityMatch = false;
boolean isReceiveIdentityMatch = false;
if(Arrays.stream(applyIdentityDefine).anyMatch(companyType::contains)){
isApplyIdentityMatch = true;
}
if(Arrays.stream(receiveIdentityDefine).anyMatch(companyType::contains)){
isReceiveIdentityMatch = true;
}
if(isApplyIdentityMatch && !isReceiveIdentityMatch){
return "apply";
}
if(!isApplyIdentityMatch && isReceiveIdentityMatch){
return "receive";
}
if(isApplyIdentityMatch){
return "all";
}
return "no";
}
/** /**
* 列表查询 示例 * 列表查询 示例
*/ */
......
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