个税扣缴义务人排序

src/com/engine/salary/entity/taxagent/bo/TaxAgentBO.java

@@ -82,6 +82,7 @@ public class TaxAgentBO {
         String subAdmins = SalaryI18nUtil.getI18nLabel(106283, "分管理员");
 //        String paymentAgency = SalaryI18nUtil.getI18nLabel(112448, "社保福利代缴机构");
         String description = SalaryI18nUtil.getI18nLabel(84961, "备注");
+        String sortedIndex = SalaryI18nUtil.getI18nLabel(84962, "显示顺序");
         if (isOpenDevolution) {
             columns.add(new Column(name, "name", "name%"));
             columns.add(new Column(employeeRange, "employeeRange", "employeeRange"));
@@ -89,11 +90,13 @@ public class TaxAgentBO {
 //            columns.add(new Column(subAdmins, "subAdmins", "20%"));
 //            columns.add(new Column(paymentAgency, "paymentAgency", "30%"));
             columns.add(new Column(description, "description", "name"));
+            columns.add(new Column(sortedIndex, "sortedIndex", "sortedIndex"));
         } else {
             columns.add(new Column(name, "name", "name"));
             columns.add(new Column(employeeRange, "employeeRange", "employeeRange"));
 //            columns.add(new WeaTableColumn(paymentAgency, "paymentAgency", "30%"));
             columns.add(new Column(description, "description", "description"));
+            columns.add(new Column(sortedIndex, "sortedIndex", "sortedIndex"));
         }
         listPage.setColumns(columns);
     }
@@ -186,6 +189,7 @@ public class TaxAgentBO {
                     }
                     map.put("paymentAgency", buildPaymentAgency(e.getPaymentAgency(), paymentAgencyPOS));
                     map.put("description", e.getDescription());
+                    map.put("sortedIndex", e.getSortedIndex());
                     return map;
                 }).collect(Collectors.toList());
     }
@@ -231,6 +235,7 @@ public class TaxAgentBO {
                 .creator(employeeId)
                 .deleteType(0)
                 .tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY)
+                .sortedIndex(saveParam.getSortedIndex())
                 .build();
     }
 

src/com/engine/salary/entity/taxagent/param/TaxAgentSaveParam.java

@@ -40,4 +40,7 @@ public class TaxAgentSaveParam {
     //备注
     @DataCheck( max = 50, message = "备注不超过50个字符")
     private String description;
+
+    // 排序id
+    private Integer sortedIndex;
 }

src/com/engine/salary/entity/taxagent/po/TaxAgentPO.java

@@ -69,5 +69,10 @@ public class TaxAgentPO {
      */
     private Date updateTime;
 
+    /**
+     * 排序
+     */
+    private Integer sortedIndex;
+
     private Collection<Long> ids;
 }

src/com/engine/salary/mapper/taxagent/TaxAgentMapper.xml

@@ -10,6 +10,7 @@
         <result column="name" property="name"/>
         <result column="tenant_key" property="tenantKey"/>
         <result column="update_time" property="updateTime"/>
+        <result column="sorted_index" property="sortedIndex"/>
     </resultMap>
 
     <!-- 表字段 -->
@@ -22,6 +23,7 @@
         , t.name
         , t.tenant_key
         , t.update_time
+        , t.sorted_index
     </sql>
 
     <sql id="paramSql">
@@ -43,7 +45,7 @@
         FROM hrsa_tax_agent t
         WHERE delete_type = 0
         <include refid="paramSql"/>
-        ORDER BY id DESC
+        ORDER BY sorted_index DESC
     </select>
 
     <!-- 查询全部 -->
@@ -52,7 +54,7 @@
         <include refid="baseColumns"/>
         FROM hrsa_tax_agent t
         WHERE delete_type = 0
-        ORDER BY id DESC
+        ORDER BY sorted_index DESC
     </select>
 
     <!-- 根据主键获取单条记录 -->
@@ -95,6 +97,9 @@
             <if test="updateTime != null">
                 update_time,
             </if>
+            <if test="sortedIndex != null">
+                sorted_index,
+            </if>
         </trim>
         <trim prefix="VALUES (" suffix=")" suffixOverrides=",">
             <if test="createTime != null">
@@ -121,6 +126,9 @@
             <if test="updateTime != null">
                 #{updateTime},
             </if>
+            <if test="sortedIndex != null">
+                #{sortedIndex},
+            </if>
         </trim>
     </insert>
 
@@ -157,6 +165,9 @@
             <if test="updateTime != null">
                 update_time,
             </if>
+            <if test="sortedIndex != null">
+                sorted_index,
+            </if>
         </trim>
         <trim prefix="VALUES (" suffix=")" suffixOverrides=",">
             <if test="createTime != null">
@@ -183,6 +194,9 @@
             <if test="updateTime != null">
                 #{updateTime},
             </if>
+            <if test="sortedIndex != null">
+                #{sortedIndex},
+            </if>
         </trim>
     </insert>
     <!-- 更新,更新全部字段 -->
@@ -196,6 +210,7 @@
             name=#{name},
             tenant_key=#{tenantKey},
             update_time=#{updateTime},
+            sorted_index=#{sortedIndex}
         </set>
         WHERE id = #{id} AND delete_type = 0
     </update>