保险公司排序修改

src/main/java/com/ydtech/modules/protocol/controller/TaxSourceController.java

@@ -48,6 +48,12 @@ public class TaxSourceController extends BaseController {
         return HttpResult.ok(insureCompany);
     }
 
+    @GetMapping("/modifySort")
+    @ApiOperation("修改排序")
+    public HttpResult modifySort(String companyId,String sort){
+        return HttpResult.ok(taxSourceService.modifySort(companyId,sort) ? "修改排序成功" : "修改排序失败");
+    }
+
     @GetMapping("/agreement")
     @ApiOperation("获取协议")
     public HttpResult agreement(String companyId) {

src/main/java/com/ydtech/modules/protocol/service/ITaxSourceService.java

@@ -33,4 +33,12 @@ public interface ITaxSourceService extends IService<TaxSourceDto> {
      *  @Description: 通过用户id查询关联的协议
      */
     List<PtlAgreementInsCompanyDto> getAllAgreementByUserId(String userId);
+
+    /**
+     * 设置保险公司排序
+     * @param companyId
+     * @param sort
+     * @return
+     */
+    boolean modifySort(String companyId,String sort);
 }

src/main/java/com/ydtech/modules/protocol/service/impl/TaxSourceServiceImpl.java

@@ -441,5 +441,12 @@ public class TaxSourceServiceImpl extends ServiceImpl<TaxSourceMapper, TaxSource
         return agreementInsCompany;
     }
 
+    @Override
+    public boolean modifySort(String companyId, String sort) {
+        EsmInsCompany byId = esmInsCompanyService.getById(companyId);
+        byId.setOrderNum(Integer.parseInt(sort));
+        return esmInsCompanyService.updateById(byId);
+    }
+
 
 }

src/main/resources/mapper/modules/protocol/PtlAgreementMapper.xml

@@ -85,7 +85,7 @@
                             where dept_id = #{deptId}
                         </if>
                         )
-          order by pa.serial_number
+          order by eic.order_num IS NULL, eic.order_num ASC
     </select>
 
 

src/main/resources/mapper/modules/protocol/TaxSourceMapper.xml

@@ -48,6 +48,8 @@
         </if>
         GROUP BY
         eic.id
+        ORDER BY eic.order_num IS NULL, eic.order_num ASC
+
     </select>
 
 </mapper>