添加车用气瓶变更业务接口

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgChangeVehicleRegistrationUnitDto.java

 package com.yeejoin.amos.boot.module.jg.api.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -7,6 +8,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 单位变更登记
@@ -127,4 +129,8 @@ public class JgChangeVehicleRegistrationUnitDto extends BaseDto {
     @ApiModelProperty(value = "车辆属地")
     private String vehicleApanage;
 
+    @ApiModelProperty(value = "车牌号")
+    private String carNumber;
+
+    private List<String> roleIds;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgChangeVehicleRegistrationUnit.java

@@ -233,4 +233,10 @@ public class JgChangeVehicleRegistrationUnit extends BaseEntity {
 	@TableField("vehicle_apanage")
     private String vehicleApanage;
 
+    /**
+     * 车牌号
+     */
+	@TableField("car_number")
+    private String carNumber;
+
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgChangeVehicleRegistrationUnitMapper.java

 package com.yeejoin.amos.boot.module.jg.api.mapper;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeVehicleRegistrationUnitDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeVehicleRegistrationUnit;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
@@ -16,4 +18,11 @@ import java.util.Map;
 public interface JgChangeVehicleRegistrationUnitMapper extends BaseMapper<JgChangeVehicleRegistrationUnit> {
 
     List<Map<String, Object>> getEquList(@Param("records") List<String>records);
+
+    Page<JgChangeVehicleRegistrationUnit> getPage(@Param("page")Page<JgChangeVehicleRegistrationUnit>page,
+                                                  @Param("dto")JgChangeVehicleRegistrationUnitDto dto,
+                                                  @Param("type") String type,
+                                                  @Param("orgCode") String orgCode,
+                                                  @Param("currentUserId") String currentUserId,
+                                                  @Param("roleIds") List<String> roleIds);
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgChangeVehicleRegistrationUnitMapper.xml

@@ -37,8 +37,63 @@
         </foreach>
 
     </select>
-
-
+    <select id="getPage"
+            resultType="com.yeejoin.amos.boot.module.jg.api.entity.JgChangeVehicleRegistrationUnit">
+        select
+        cru.sequence_nbr,
+        cru.change_type,
+        cru.apply_no,
+        date_format(cru.apply_date,'%Y-%m-%d')  as applyDate,
+        date_format(cru.audit_pass_date,'%Y-%m-%d')  as auditPassDate,
+        cru.receive_org_name,
+        cru.receive_org_code,
+        cru.use_unit_name,
+        cru.new_use_unit_name,
+        cru.transfer_to_user_ids,
+        cru.car_number,
+        cru.next_execute_user_ids,
+        cru.next_task_id,
+        cru.use_regist_code,
+        cru.status,
+        cru.instance_status,
+        cru.promoter,
+        cru.next_executor_ids,
+        cru.instance_id
+        from tzs_jg_change_vehicle_registration_unit cru
+        <where>
+            <if test="dto.applyNo != null and dto.applyNo != ''">
+                and cru.apply_no like concat('%', #{dto.applyNo}, '%')
+            </if>
+            <if test="dto.applyDate != null and dto.applyDate != ''">
+                and cru.apply_date = #{dto.applyDate}
+            </if>
+                <if test="dto.status != null and dto.status != ''">
+                and cru.status = #{dto.status}
+            </if>
+            <if test="dto.auditPassDate != null and dto.auditPassDate != ''">
+                and cru.audit_pass_date = #{dto.auditPassDate}
+            </if>
+            <if test="dto.newUseUnitCreditCode != null and dto.newUseUnitCreditCode != ''">
+                and cru.new_use_unit_credit_code = #{dto.newUseUnitCreditCode}
+            </if>
+            <if test="dto.useUnitCreditCode != null and dto.useUnitCreditCode != ''">
+                and cru.use_unit_credit_code = #{dto.useUnitCreditCode}
+            </if>
+            <if test="type == 'supervision'">
+                AND (cru.receive_org_code = #{orgCode} or cru.transfer_to_user_ids LIKE concat ( '%', #{currentUserId}, '%' ))
+                AND cru.instance_id <![CDATA[<>]]>  ''
+            </if>
+            <if test="type == 'enterprise'">
+                AND (cru.new_use_unit_credit_code = #{orgCode} or cru.transfer_to_user_ids LIKE concat ( '%', #{currentUserId}, '%' ))
+            </if>
+            <if test="roleIds != null and type == 'supervision'">
+                <foreach collection='roleIds' item='role' open='and (' close=')' separator='or'>
+                    cru.instance_status like concat('%',#{role},'%')
+                </foreach>
+            </if>
+        </where>
+        order by cru.rec_date desc
+    </select>
 
 
 </mapper>

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgChangeVehicleRegistrationUnitController.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.jg.biz.controller;
 import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationManageDto;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeVehicleRegistrationUnit;
 import com.yeejoin.amos.boot.module.jg.api.enums.CompanyTypeEnum;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -172,6 +173,13 @@ public class JgChangeVehicleRegistrationUnitController extends BaseController {
 	}
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@DeleteMapping(value = "/delete")
+	@ApiOperation(httpMethod = "DELETE", value = "删除", notes = "删除")
+	public ResponseModel<Object> withdraw(@RequestParam(value = "sequenceNbr") String sequenceNbr) {
+		jgChangeVehicleRegistrationUnitServiceImpl.deleteMessage(sequenceNbr);
+		return ResponseHelper.buildResponse("ok");
+	}
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/flowExecute")
 	@ApiOperation(httpMethod = "POST", value = "执行流程", notes = "执行流程")
 	public ResponseModel<Object> flowExecute(@RequestBody JSONObject map) {
@@ -182,4 +190,23 @@ public class JgChangeVehicleRegistrationUnitController extends BaseController {
 				String.valueOf(map.get("nextTaskId")));
 		return ResponseHelper.buildResponse("ok");
 	}
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/getPage")
+	@ApiOperation(httpMethod = "POST", value = "车用气瓶列表", notes = "车用气瓶列表")
+	public ResponseModel<Object> getPage(JgChangeVehicleRegistrationUnitDto dto,
+										 @RequestParam(value = "number") int number,
+										 @RequestParam(value = "size") int size) {
+		Page<JgChangeVehicleRegistrationUnit> page = new Page<>(number, size);
+		ReginParams reginParams = getSelectedOrgInfo();
+		ReginParams info = getSelectedOrgInfo();
+		String type = "";
+		if (info.getCompany().getLevel().equals(BaseController.COMPANY_TYPE_COMPANY)){
+			type = "enterprise";
+		}else {
+			type = "supervision";
+		}
+
+		return ResponseHelper.buildResponse(jgChangeVehicleRegistrationUnitServiceImpl.getPage(page, dto, type, reginParams));
+	}
 }

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

@@ -2075,7 +2075,7 @@ public class CommonServiceImpl implements ICommonService {
      * @param equCategoryCode   设备类别编码
      * @return
      */
-    @Autowired
+    @Override
     public JgUseRegistrationManage getLatestJgUseRegistrationManage(String useUnitCreditCode, String equCategoryCode) {
         LambdaQueryWrapper<JgUseRegistrationManage> lambdaQueryWrapper = new LambdaQueryWrapper();
         lambdaQueryWrapper.eq(JgUseRegistrationManage::getUseUnitCreditCode, useUnitCreditCode);