Merge branch 'LeoN'

src/main/java/com/mokamrp/privates/controller/pangu/FosterwxStationBindBoxController.java

@@ -7,10 +7,7 @@ import com.mokamrp.privates.config.OSSConfiguration;
 import com.mokamrp.privates.constant.Constants;
 import com.mokamrp.privates.constant.HttpMsg;
 import com.mokamrp.privates.constant.HttpStatus;
-import com.mokamrp.privates.entity.PostBasePageHandle;
-import com.mokamrp.privates.entity.ResHandle;
-import com.mokamrp.privates.entity.SetGroupHandle;
-import com.mokamrp.privates.entity.VoltaHandle;
+import com.mokamrp.privates.entity.*;
 import com.mokamrp.privates.entity.pangu.GetForsterwxStationBindBoxHandle;
 import com.mokamrp.privates.help.AjaxResult;
 import com.mokamrp.privates.help.Analysis;
@@ -92,6 +89,19 @@ public class FosterwxStationBindBoxController extends BaseController<FosterwxSta
         return AjaxResult.success(Constants.SUCCESS, true);
     }
 
+    @ApiOperation(value = "批量设置状态")
+    @PostMapping("/setStatus")
+    public Object setStatus(@Valid @RequestBody SetIdsHandle handle, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
+        }
+        FosterwxStationBindBox save = new FosterwxStationBindBox();
+        save.setStatus(handle.getId());
+        save.setUpdateAt(LocalDateTime.now());
+        service.update(save, new QueryWrapper<FosterwxStationBindBox>().in("id", handle.getIds()));
+        return AjaxResult.success(Constants.SUCCESS, true);
+    }
+
     /**
      * 导入
      *

src/main/java/com/mokamrp/privates/controller/pangu/FosterwxStationPayController.java

@@ -1,7 +1,9 @@
 package com.mokamrp.privates.controller.pangu;
 
+import com.mokamrp.privates.constant.Constants;
 import com.mokamrp.privates.constant.HttpMsg;
 import com.mokamrp.privates.constant.HttpStatus;
+import com.mokamrp.privates.entity.AddHandle;
 import com.mokamrp.privates.entity.PostBasePageHandle;
 import com.mokamrp.privates.entity.VoltaHandle;
 import com.mokamrp.privates.help.AjaxResult;
@@ -39,7 +41,7 @@ import org.springframework.web.multipart.MultipartFile;
  */
 @RestController
 @Api(tags = "站点支出")
-@RequestMapping("/fosterwxStationPay")
+@RequestMapping("/pangu/fosterwxStationPay")
 public class FosterwxStationPayController extends BaseController<FosterwxStationPay> {
 
     @Autowired
@@ -60,6 +62,21 @@ public class FosterwxStationPayController extends BaseController<FosterwxStation
         return AjaxResult.success(res);
     }
 
+    @PostMapping("/addPro")
+    public Object addPro(@Valid @RequestBody AddHandle<FosterwxStationPay> addHandle, BindingResult bindingResult,@AuthUser User authUser) {
+        if (bindingResult.hasErrors()) {
+            return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
+        }
+        this.onInsert(addHandle.getRaw());
+        addHandle.getRaw().setCreateUid(authUser.getId());
+        Boolean res = service.save(addHandle.getRaw());
+        if (res) {
+            return AjaxResult.success(Constants.SUCCESS, res);
+        } else {
+            return AjaxResult.error("新增失败", res);
+        }
+    }
+
     @PostMapping("/import")
     public Object uploadFile(@RequestBody MultipartFile file, @AuthUser User authUser) {
         Map<String, Object> map = new HashMap<>(16);

src/main/java/com/mokamrp/privates/entity/PostBasePageHandle.java

@@ -20,6 +20,7 @@ public class PostBasePageHandle {
     private String name;
     private Integer type;
     private Integer taskType;
+    private Integer amtType;
     private Integer templateId;
     private Integer catalogId;
     private String ghId;
@@ -29,6 +30,7 @@ public class PostBasePageHandle {
     private Integer status;
     private Integer materialId;
     private Integer tagId;
+    private String remark;
     private String domain;
     private String content;
     private LocalDate startDate;

src/main/java/com/mokamrp/privates/mapper/pangu/FosterwxStationPayMapper.xml

@@ -23,10 +23,12 @@
     <select id="getList" resultType="com.mokamrp.privates.mapper.pangu.pojo.FosterwxStationPay">
         SELECT * FROM pan_fosterwx_station_pay
         <where>
-            <if test="params.stationId != nil">and station_id = #{params.stationId}</if>
-            <if test="params.type != nil">and station_id = #{params.stationId}</if>
-            <if test="params.stationId != nil">and station_id = #{params.stationId}</if>
-            <if test="params.stationId != nil">and station_id = #{params.stationId}</if>
+            <if test="params.stationId != null">and station_id = #{params.stationId}</if>
+            <if test="params.type != null">and pay_type = #{params.type}</if>
+            <if test="params.amtType != null">and amt_type = #{params.amtType}</if>
+            <if test="params.remark != null">and remark like concat('%',#{params.remark},'%')</if>
+            and del_flg = 1
         </where>
+        order by id desc
     </select>
 </mapper>

src/main/java/com/mokamrp/privates/mapper/pangu/pojo/FosterwxStation.java

@@ -1,5 +1,6 @@
 package com.mokamrp.privates.mapper.pangu.pojo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
@@ -72,6 +73,8 @@ public class FosterwxStation extends Model<FosterwxStation> {
      */
     private String loginPassword;
     private Float fansAmt;
+
+
     /**
      * 创建人
      */