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

ke

2024-05-15 ab5c1c6cbcdeb98d84bdde3c111fe871466d3a5c

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

 skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeHandle.java

@@ -590,7 +590,7 @@
     */
    public AlarmRecord saveAlarmRecord(List<String> list, AlarmRule alarmRule, String uuid) {
        AlarmRecord alarmRecord = alarmRecordService.getOne(new QueryWrapper<AlarmRecord>()
            .eq("temp_code", uuid)
//            .eq("temp_code", uuid)
            .eq("alarm_rule_id", alarmRule.getId())
            .eq("reservoir_number", list.get(1))
            .eq("alarm_survey_station_code",list.get(0))

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/mapper/HkEventMapper.xml

@@ -19,7 +19,12 @@
        bdb.dict_value as eventTypeName
        from YWXT.sm_hk_event she
        left join YWXT.blade_dict_biz bdb on bdb.dict_key = she.event_type and bdb.is_deleted = 0 and code = 'EVENT_TYPE'
        left join SJZT_MD."att_wmst_base" awb on awb."video_guid" = she.src_index
        left join (
            select "res_guid","video_guid" from SJZT_MD."att_wmst_base"
            union all
            select "regionindexcode" as "res_guid","gbindexcode" as "video_guid" from SJZT_ODS."haik_gb_wmst_base"
        )
        awb on awb."video_guid" = she.src_index
        left join SJZT_MD."att_res_base" a on a."guid" = awb."res_guid"
        left join SJZT_MD."att_ad_base" b on b."guid" = a."interior_ad_guid"
        LEFT JOIN SJZT_MD."att_ad_base" c ON b."p_ad_code" = c."guid"

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbDykeInvestigationController.java

@@ -102,9 +102,9 @@
    @ApiOperation(value = "白蚁普查-添加或者修改", notes = "白蚁普查-添加或者修改")
    @PostMapping(value = "/submit")
    public R submit(@RequestBody TbDykeInvestigation tbDykeInvestigation) {
        if (tbDykeInvestigation.getGuid() == null) {
            tbDykeInvestigation.setCreateTime(new Date());
        }
//        if (tbDykeInvestigation.getGuid() == null) {
        tbDykeInvestigation.setCreateTime(new Date());
//        }
        return tbDykeInvestigationService.saveOrUpdateBy(tbDykeInvestigation);
    }


 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbResGeneralInvestigationController.java

@@ -104,9 +104,9 @@
    @ApiOperation(value = "白蚁普查-添加或者修改", notes = "白蚁普查-添加或者修改")
    @PostMapping(value = "/submit")
    public R submit(@RequestBody TbResGeneralInvestigation tbResGeneralInvestigation) {
        if (tbResGeneralInvestigation.getGuid() == null) {
            tbResGeneralInvestigation.setCreateTime(new Date());
        }
//        if (tbResGeneralInvestigation.getGuid() == null) {
        tbResGeneralInvestigation.setCreateTime(new Date());
//        }
        return tbResGeneralInvestigationService.saveOrUpdateBy(tbResGeneralInvestigation);
    }


 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbDykeInvestigationServiceImpl.java

@@ -73,7 +73,9 @@
        tbDykeInvestigationStateService.saveOrUpdate(state);

        entity.setTbStateId(state.getGuid());
        return R.status(this.saveOrUpdate(entity));
//        return R.status(this.saveOrUpdate(entity));
        this.saveOrUpdate(entity);
        return R.data(entity);
    }

    @Override

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbResGeneralInvestigationServiceImpl.java

@@ -72,7 +72,9 @@
        tbResGeneralInvestigationStateService.saveOrUpdate(state);

        entity.setTbStateId(state.getGuid());
        return R.status(this.saveOrUpdate(entity));
//        return R.status(this.saveOrUpdate(entity));
        this.saveOrUpdate(entity);
        return R.data(entity);
    }

    @Override