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

sp-service/level-two-server/src/main/java/com/pj/tb_purchaser/TbPurchaser.java

@@ -39,7 +39,7 @@ public class TbPurchaser extends Model<TbPurchaser> implements Serializable {
 	public static final String PERMISSION_CODE_ADD = "tb-purchaser-add";
 	public static final String PERMISSION_CODE_EDIT = "tb-purchaser-edit";
 	public static final String PERMISSION_CODE_DEL = "tb-purchaser-del";
-
+	public static final String PERMISSION_CODE_JUDGE = "tb-purchaser-judge";
 
 
 
@@ -143,6 +143,8 @@ public class TbPurchaser extends Model<TbPurchaser> implements Serializable {
 	@JsonFormat(pattern = "yyyy-MM-dd")
 	private Date judgeTime;
 
+	@Excel(name = "审核人")
+	private String judgeBy;
 	/**
 	 * 注册时间
 	 */

sp-service/level-two-server/src/main/java/com/pj/tb_purchaser/TbPurchaserController.java

@@ -141,6 +141,16 @@ public class TbPurchaserController {
 		if(line)return AjaxJson.getSuccess("认证完成!");
 		return AjaxJson.getError("认证失败!");
 	}
+	@RequestMapping("auditBatch")
+	@SaCheckPermission(TbPurchaser.PERMISSION_CODE_JUDGE)
+	public AjaxJson auditBatch(){
+		SoMap soMap=SoMap.getRequestSoMap();
+		List<Long> ids=soMap.getListByComma("ids",Long.class);
+		Integer judgeStatus=soMap.getInt("judgeStatus");
+		String judgeContent=soMap.getString("judgeContent");
+		tbPurchaserService.auditBatch(ids,judgeStatus,judgeContent);
+		return AjaxJson.getSuccess();
+	}
 
 	/** 是否锁住收购商 */
 	@RequestMapping("isLock")

sp-service/level-two-server/src/main/java/com/pj/tb_purchaser/TbPurchaserService.java

@@ -22,6 +22,7 @@ import com.pj.common.core.exception.ServiceException;
 import com.pj.current.satoken.StpUserUtil;
 import com.pj.enummj.*;
 import com.pj.tb_purchaser.param.PurchaserParam;
+import com.pj.utils.sg.AjaxError;
 import com.pj.utils.so.SoMap;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.hssf.usermodel.HSSFRow;
@@ -168,6 +169,19 @@ public class TbPurchaserService extends ServiceImpl<TbPurchaserMapper, TbPurchas
 		if(purchaserList.size() == 0)return null;
 		return purchaserList.get(0);
 	}
+	/** 收购商批量审核 */
+	public void auditBatch(List<Long> ids, Integer judgeStatus, String judgeContent) {
+		if (ids.isEmpty()) {
+			throw new AjaxError("必要参数不能为空");
+		}
+		List<TbPurchaser> list = listByIds(ids);
+		String name = StpUserUtil.getLoginName();
+		list.forEach(tbPurchaser -> {
+			tbPurchaser.setJudgeStatus(judgeStatus).setJudgeContent(judgeContent).setJudgeTime(new Date()).setJudgeBy(name);
+		});
+		this.updateBatchById(list);
+	}
+
 
 	/** 是否锁住收购商 */
 	public int isLock(TbPurchaserDto purchaserDto) {