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

guoshilong

2023-06-21 b37bdc2060e6bd7bf8cb2b2d844fe45a549d210a

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

 skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/vo/CallNotFillRecordVO.java

@@ -11,5 +11,23 @@
 */
@Data
public class CallNotFillRecordVO extends CallNotFillRecord {
    /**
     * 水库名称
     */
    private String waterName;

    /**
     * 姓名
     */
    private String realName;

    /**
     * 呼叫时间
     */
    private String callTime;

    /**
     * 用户账号
     */
    private String account;
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/mapper/CallNotFillRecordMapper.xml

@@ -4,8 +4,19 @@

    <!--自定义分页列表查询-->
    <select id="selectCallNotFillRecordPage" resultType="cn.gistack.sm.intelligentCall.vo.CallNotFillRecordVO">
        select * from sm_call_not_fill_record
        select
        scnfr.*,
        arb."name" as waterName,
        bu.real_name as realName,
        ctr."gmt_create" as callTime
        from YWXT.sm_call_not_fill_record scnfr
        left join SJZT_MD."att_res_base" arb on scnfr.water_guid = arb."code"
        left join YWXT.blade_user bu on bu.phone = scnfr.tel and bu.is_deleted = 0
        left join SJZT_ODS."call_task_result" ctr on ctr."call_id" = scnfr.call_id
        where 1=1
        <if test="callNotFillRecord.account!=null and callNotFillRecord.account!=''">
            and bu.account = #{callNotFillRecord.account}
        </if>
        order by id desc
    </select>


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

@@ -107,6 +107,8 @@
                obj.put("code",code.substring(0,2));
            } else if (code.substring(0,6).indexOf("00") > -1) {
                obj.put("code",code.substring(0,4));
            } else if (code.substring(0,8).indexOf("00") > -1) {
                obj.put("code",code.substring(0,6));
            }
        }
        List<AttAdBaseVO> list = attAdBaseService.lazyTreeAll(parentCode, obj);

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResBase.java

@@ -66,6 +66,13 @@
    @ApiModelProperty(value = "注册登记码")
    @TableField("\"res_reg_code\"")
    private String resRegCode;

    /**
     * 注册登记码
     */
    @ApiModelProperty(value = "标签")
    @TableField("\"label\"")
    private String label;
//
//    /**
//     * 其他行业注册号

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.xml

@@ -122,6 +122,9 @@
        <if test="attResBase.interiorAdGuid !=null and attResBase.interiorAdGuid != ''">
            "interior_ad_guid" = #{attResBase.interiorAdGuid},
        </if>
        <if test="attResBase.label !=null and attResBase.label != ''">
            "label" = #{attResBase.label},
        </if>
        "update_time" = #{attResBase.updateTime}
        WHERE "guid" = #{attResBase.guid}
    </update>

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResManagePersonMapper.xml

@@ -150,8 +150,7 @@
            order by "user_phone") a) a
            ) b
        set
            a.role_id = b.role_id,
            -- a.dept_id = case b.role_id when '1642713427301355522' then cast(b."ad_code" as bigint) + 1 else b."ad_code" end
            a.role_id = b.role_id
        where a.phone = b."user_phone" and a.role_id &lt;&gt; b.role_id
    </update>