feature(jg):增补接口修改

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/enums/FillingRecordFieldEnum.java

@@ -21,7 +21,6 @@ public enum FillingRecordFieldEnum {
     fillingUser(true, false),
     inspectorName(true, false),
     fillingQuantity(true, false),
-    dischargeVolume(true, false),
     temperature(true, false),
     abnormal(true, false),
     syncDate(true, false),

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/model/TmCylinderFillingRecordModel.java

@@ -23,6 +23,5 @@ public class TmCylinderFillingRecordModel extends AbstractBaseModel{
 	private String fillingBeforeId; // 充装信息审核ID
 	private String fillingCheckId;  // 充装后复查ID
 	private String fillingExamineId; // 充装信息审核ID
-    private double dischargeVolume; // 卸液量（Kg） 小数点两位
 
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/TmCylinderFillingRecord.java

@@ -42,8 +42,6 @@ public class TmCylinderFillingRecord extends AbstractBaseEntity{/**
 	private String fillingCheckId;
 	@TableField("filling_examine_id")
 	private String fillingExamineId;
-	@TableField("discharge_volume")
-	private double dischargeVolume; // 卸液量（Kg） 小数点两位
 
 	@ApiModelProperty(value = "对接接口版本")
 	protected String version = "v1";

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

@@ -479,6 +479,9 @@
         <if test="jsonObject.useUnitCreditCode != null and jsonObject.useUnitCreditCode != '' and jsonObject.record == null">
             and ui."USE_UNIT_CREDIT_CODE" = #{jsonObject.useUnitCreditCode}
         </if>
+        <if test="jsonObject.projectContraption != null and jsonObject.projectContraption != ''">
+            and ui."PROJECT_CONTRAPTION" = #{jsonObject.projectContraption}
+        </if>
         <if test="jsonObject.record != null and jsonObject.record != ''">
             and ui."RECORD" = #{jsonObject.record}
         </if>

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

@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import com.yeejoin.amos.boot.module.jg.api.enums.CompanyTypeEnum;
 import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgRegisterInfoService;
 import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
 import io.swagger.annotations.Api;
@@ -237,4 +236,11 @@ public class IdxBizJqEquipmentRegisterController extends BaseController {
         return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.esSynchronousProjectContraption());
     }
 
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/contraption/list")
+    @ApiOperation(httpMethod = "GET", value = "查询当前单位下已注册或未注册工程装置信息", notes = "查询当前单位下已注册或未注册工程装置信息")
+    public ResponseModel<List<Map<String, Object>>> getProjectContraptionByCondition() {
+        String unitCreditCode = getSelectedOrgInfo().getCompany().getCompanyCode();
+        return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.getUnRegisterProjectContraptionList(unitCreditCode));
+    }
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/IIdxBizJgRegisterInfoService.java

@@ -48,4 +48,12 @@ public interface IIdxBizJgRegisterInfoService {
     Object getProjectContraption(String uscUnitCreditCode);
 
     Boolean esSynchronousProjectContraption();
+
+    /**
+     * 查询单位下工程装置信息
+     *
+     * @param useUnitCreditCode 单位统一信用代码
+     * @return 查询单位下工程装置信息
+     */
+    List<Map<String, Object>> getUnRegisterProjectContraptionList(String useUnitCreditCode);
 }

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

@@ -3121,4 +3121,9 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         }
         return Boolean.TRUE;
     }
+
+    @Override
+    public List<Map<String, Object>> getUnRegisterProjectContraptionList(String useUnitCreditCode) {
+        return this.baseMapper.getUnRegisterProjectContraptionList(useUnitCreditCode);
+    }
 }
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/IdxBizJgRegisterInfoMapper.java

@@ -31,4 +31,16 @@ public interface IdxBizJgRegisterInfoMapper extends BaseMapper<IdxBizJgRegisterI
     @Select("SELECT SEQUENCE_NBR,REC_DATE,ORG_BRANCH_NAME,ORG_BRANCH_CODE,USE_UNIT_NAME,USE_UNIT_CREDIT_CODE,EQU_LIST_CODE,EQU_LIST,EQU_CATEGORY,EQU_CATEGORY_CODE,USE_ORG_CODE,CODE96333,EQU_CODE,SUPERVISORY_CODE,USE_PLACE,ADDRESS,EQU_STATE,STATUS,USE_INNER_CODE,FACTORY_NUM,PRODUCE_UNIT_NAME,INSPECT_REPORT,NEXT_INSPECT_DATE,CONSTRUCTION_TYPE,USC_UNIT_CREDIT_CODE,USC_UNIT_NAME,EQU_DEFINE,EQU_DEFINE_CODE,PRODUCT_NAME,BRAND_NAME,EQU_TYPE,DATA_SOURCE,IS_INTO_MANAGEMENT,WHETHER_VEHICLE_CYLINDER,WHETHER_SKID_MOUNTED_PRESSURE_VESSEL,DATE_FORMAT(PRODUCE_DATE,'%Y-%m-%d %H:%i:%s')as PRODUCE_DATE,PROJECT_CONTRAPTION from idx_biz_view_jg_all WHERE PROJECT_CONTRAPTION is not null")
     List<Map<String, Object>> esSynchronousProjectContraption();
 
+    @Select("SELECT\n" +
+            "\tjui.PROJECT_CONTRAPTION AS value \n" +
+            "FROM\n" +
+            "\tidx_biz_jg_use_info jui\n" +
+            "\tLEFT JOIN idx_biz_jg_register_info jri ON jri.\"RECORD\" = jui.\"RECORD\"\n" +
+            "WHERE\n" +
+            "\tjui.USE_UNIT_CREDIT_CODE = #{useUnitCreditCode} \n" +
+            "\tAND jui.PROJECT_CONTRAPTION IS NOT NULL\n" +
+            "\tAND jri.\"USE_ORG_CODE\" IS NULL\n" +
+            "GROUP BY\n" +
+            "\tjui.PROJECT_CONTRAPTION")
+    List<Map<String, Object>> getUnRegisterProjectContraptionList(String useUnitCreditCode);
 }