Merge remote-tracking branch 'origin/master'

zh-baseversion-system/src/main/java/com/zehong/system/domain/TComplainDeal.java

@@ -85,6 +85,19 @@ public class TComplainDeal extends BaseEntity
      */
     private String provincialDataFlag;
 
+    /*
+     * 投诉渠道(1-12319热线,2-12345热线)
+     * */
+    private String complaintChannels;
+
+    public String getComplaintChannels() {
+        return complaintChannels;
+    }
+
+    public void setComplaintChannels(String complaintChannels) {
+        this.complaintChannels = complaintChannels;
+    }
+
     public String getProvincialDataFlag() {
         return provincialDataFlag;
     }

zh-baseversion-system/src/main/java/com/zehong/system/service/impl/TPlanInfoServiceImpl.java

@@ -117,7 +117,7 @@ public class TPlanInfoServiceImpl implements ITPlanInfoService
             List<String> collect = tComplainDealTransfers.stream().map(TComplainDealTransfer::getEnterpriseId).collect(Collectors.toList());
             return tPlanInfoMapper.transferEnterpriseList(collect);
         } else {
-            return new ArrayList<>();
+            return tPlanInfoMapper.selectEnterprise();
         }
     }
 }

zh-baseversion-system/src/main/resources/mapper/system/TComplainDealMapper.xml

@@ -27,6 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="complainType"    column="complain_type" />
         <result property="overtimeSupervision"    column="overtime_supervision" />
         <result property="township"    column="township" />
+        <result property="complaintChannels"    column="complaint_channels" />
     </resultMap>
 
     <sql id="selectTComplainDealVo">
@@ -47,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                update_by,
                update_time,
                is_del,
-               remarks,provincial_data_flag,complain_type,overtime_supervision,township from t_complain_deal
+               remarks,provincial_data_flag,complain_type,overtime_supervision,township,complaint_channels from t_complain_deal
     </sql>
 
     <select id="selectTComplainDealList" parameterType="TComplainDeal" resultMap="TComplainDealResult">
@@ -69,6 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="complainType != null  and complainType != ''"> and complain_type = #{complainType}</if>
             <if test="overtimeSupervision != null  and overtimeSupervision != ''"> and overtime_supervision = #{overtimeSupervision}</if>
             <if test="township != null  and township != ''"> and township = #{township}</if>
+            <if test="complaintChannels != null  and complaintChannels != ''"> and complaint_channels = #{complaintChannels}</if>
         </where>
         order by create_time desc
     </select>
@@ -127,6 +129,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="complainType != null">complain_type,</if>
             <if test="overtimeSupervision != null">overtime_supervision,</if>
             <if test="township != null">township,</if>
+            <if test="complaintChannels != null">complaint_channels,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="complainName != null">#{complainName},</if>
@@ -150,6 +153,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="complainType != null">#{complainType},</if>
             <if test="overtimeSupervision != null">#{overtimeSupervision},</if>
             <if test="township != null">#{township},</if>
+            <if test="complaintChannels != null">#{complaintChannels},</if>
          </trim>
     </insert>
 
@@ -186,6 +190,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="complainType != null">complain_type = #{complainType},</if>
             <if test="overtimeSupervision != null">overtime_supervision = #{overtimeSupervision},</if>
             <if test="township != null">township = #{township},</if>
+            <if test="complaintChannels != null">complaint_channels = #{complaintChannels},</if>
         </trim>
         where complain_deal_id = #{complainDealId}
     </update>