Merge branch 'master' of http://git.dayaedu.com/yonge/mec into 2021-04-28

 Conflicts:

	mec-biz/src/main/resources/config/mybatis/ReplacementInstrumentActivityMapper.xml

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/GoodsDao.java

@@ -3,11 +3,13 @@ package com.ym.mec.biz.dal.dao;
 import com.ym.mec.biz.dal.dto.GoodsSellDto;
 import com.ym.mec.biz.dal.dto.MusicGroupGoodsAndDiscountDto;
 import com.ym.mec.biz.dal.entity.Goods;
+import com.ym.mec.biz.dal.entity.ReplacementInstrument;
 import com.ym.mec.common.dal.BaseDAO;
 
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 public interface GoodsDao extends BaseDAO<Integer, Goods> {
 
@@ -168,4 +170,18 @@ public interface GoodsDao extends BaseDAO<Integer, Goods> {
      * @return
      */
     List<Goods> getGoodsByBaseGoodsId(@Param("goodsId") Integer goodsId);
+
+    /**
+     * 获取乐器置换的商品
+     *
+     * @return
+     */
+    List<ReplacementInstrument> getReplacementGoodsPage(Map<String, Object> params);
+
+    /**
+     * 获取乐器置换商品总数
+     * @param params
+     * @return
+     */
+    Integer getReplacementInstrumentCount(Map<String, Object> params);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/StudentApplyDetailDto.java

@@ -71,6 +71,9 @@ public class StudentApplyDetailDto{
     @ApiModelProperty(value = "声部更换详情",required = false)
     private SubjectChange subjectChange;
 
+    @ApiModelProperty(value = "回访次数",required = false)
+    private Integer visitNum;
+
     public KitGroupPurchaseTypeEnum getKitGroupPurchaseTypeEnum() {
         return kitGroupPurchaseTypeEnum;
     }
@@ -214,4 +217,12 @@ public class StudentApplyDetailDto{
     public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
+
+    public Integer getVisitNum() {
+        return visitNum;
+    }
+
+    public void setVisitNum(Integer visitNum) {
+        this.visitNum = visitNum;
+    }
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/Goods.java

@@ -138,6 +138,9 @@ public class Goods {
 	@ApiModelProperty(value = "乐团是否展示")
 	private YesOrNoEnum musicGroupShow;
 
+	@ApiModelProperty(value = "乐器置换是否展示")
+	private YesOrNoEnum replacementShow;
+
 	@ApiModelProperty(value = "库存类型")
 	private StockType stockType;
 
@@ -429,4 +432,11 @@ public class Goods {
 		return ToStringBuilder.reflectionToString(this);
 	}
 
+	public YesOrNoEnum getReplacementShow() {
+		return replacementShow;
+	}
+
+	public void setReplacementShow(YesOrNoEnum replacementShow) {
+		this.replacementShow = replacementShow;
+	}
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/InspectionItemPlan.java

@@ -34,6 +34,12 @@ public class InspectionItemPlan {
     private Integer userId;
 
     /**
+     * 计划添加人
+     */
+    @ApiModelProperty(value = "计划添加人id")
+    private Integer operatorUserId;
+
+    /**
      * 日程开始时间
      */
     @ApiModelProperty(value = "日程开始时间")
@@ -313,4 +319,12 @@ public class InspectionItemPlan {
     public void setRealName(String realName) {
         this.realName = realName;
     }
+
+    public Integer getOperatorUserId() {
+        return operatorUserId;
+    }
+
+    public void setOperatorUserId(Integer operatorUserId) {
+        this.operatorUserId = operatorUserId;
+    }
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ReplacementInstrumentActivity.java

@@ -49,6 +49,9 @@ public class ReplacementInstrumentActivity {
 	
 	/** 乐器编号 */
 	private Integer instrumentsId;
+
+	/** 商品编号 */
+	private Integer goodsId;
 	
 	private String otherSuggestion;
 
@@ -211,11 +214,6 @@ public class ReplacementInstrumentActivity {
 		this.payStatus = payStatus;
 	}
 
-	@Override
-	public String toString() {
-		return ToStringBuilder.reflectionToString(this);
-	}
-
 	public YesOrNoEnum getShowQuestion() {
 		return showQuestion;
 	}
@@ -223,4 +221,17 @@ public class ReplacementInstrumentActivity {
 	public void setShowQuestion(YesOrNoEnum showQuestion) {
 		this.showQuestion = showQuestion;
 	}
+
+	public Integer getGoodsId() {
+		return goodsId;
+	}
+
+	public void setGoodsId(Integer goodsId) {
+		this.goodsId = goodsId;
+	}
+
+	@Override
+	public String toString() {
+		return ToStringBuilder.reflectionToString(this);
+	}
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/page/GoodsQueryInfo.java

@@ -37,6 +37,9 @@ public class GoodsQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "乐团端是否展示：0否，1是")
     private Integer musicGroupShow;
 
+    @ApiModelProperty(value = "乐器置换是否展示：0否，1是")
+    private Integer replacementShow;
+
     public Integer getGroupGoods() {
         return groupGoods;
     }
@@ -108,4 +111,12 @@ public class GoodsQueryInfo extends QueryInfo {
 	public void setMusicGroupShow(Integer musicGroupShow) {
 		this.musicGroupShow = musicGroupShow;
 	}
+
+    public Integer getReplacementShow() {
+        return replacementShow;
+    }
+
+    public void setReplacementShow(Integer replacementShow) {
+        this.replacementShow = replacementShow;
+    }
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/page/StudentRegistrationQueryInfo.java

@@ -21,7 +21,7 @@ public class StudentRegistrationQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "实际专业编号",required = false)
     private Integer actualSubjectId;
 
-    @ApiModelProperty(value = "学员缴费状态",required = false)
+    @ApiModelProperty(value = "学员缴费状态 0-未开启缴费 1-开启缴费 2-已缴费",required = false)
     private String paymentStatus;
 
     @ApiModelProperty(value = "用户名或手机号",required = false)
@@ -33,6 +33,9 @@ public class StudentRegistrationQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "入学年份",required = false)
     private String createYear;
 
+    @ApiModelProperty(value = "是否已回访",required = false)
+    private Boolean visited;
+
     private boolean isExport = false;
 
     public boolean getIsExport() {
@@ -106,4 +109,12 @@ public class StudentRegistrationQueryInfo extends QueryInfo {
     public void setCurrentGrade(String currentGrade) {
         this.currentGrade = currentGrade;
     }
+
+    public Boolean getVisited() {
+        return visited;
+    }
+
+    public void setVisited(Boolean visited) {
+        this.visited = visited;
+    }
 }

mec-biz/src/main/java/com/ym/mec/biz/service/ReplacementInstrumentService.java

@@ -1,8 +1,17 @@
 package com.ym.mec.biz.service;
 
+import com.ym.mec.biz.dal.entity.Goods;
 import com.ym.mec.biz.dal.entity.ReplacementInstrument;
+import com.ym.mec.biz.dal.page.ReplacementInstrumentQueryInfo;
+import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.BaseService;
 
 public interface ReplacementInstrumentService extends BaseService<Integer, ReplacementInstrument>{
 
+    /**
+     * 获取置换乐器列表
+     * @param queryInfo
+     * @return
+     */
+    PageInfo<ReplacementInstrument> getPageList(ReplacementInstrumentQueryInfo queryInfo);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/GoodsServiceImpl.java

@@ -252,6 +252,15 @@ public class GoodsServiceImpl extends BaseServiceImpl<Integer, Goods>  implement
 						}
 						continue;
 					}
+					if (columnValue.equals("replacementShow")) {
+						for (YesOrNoEnum yesOrNoEnum : YesOrNoEnum.values()) {
+							if (yesOrNoEnum.getMsg().equals(row.get(s).toString())) {
+								objectMap.put(columnValue, yesOrNoEnum);
+								break;
+							}
+						}
+						continue;
+					}
 					if (columnValue.equals("clientShow")) {
 						for (YesOrNoEnum yesOrNoEnum : YesOrNoEnum.values()) {
 							if (yesOrNoEnum.getMsg().equals(row.get(s).toString())) {

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ReplacementInstrumentActivityServiceImpl.java

@@ -11,14 +11,18 @@ import com.ym.mec.biz.dal.dto.ReplacementPayDto;
 import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.enums.*;
 import com.ym.mec.biz.dal.page.ReplacementInstrumentActivityQueryInfo;
+import com.ym.mec.biz.dal.page.ReplacementInstrumentQueryInfo;
 import com.ym.mec.biz.service.*;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.page.PageInfo;
+import com.ym.mec.common.page.QueryInfo;
 import com.ym.mec.common.service.IdGeneratorService;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.thirdparty.message.MessageSenderPluginContext;
 import com.ym.mec.util.collection.MapUtil;
+import com.ym.mec.util.date.DateUtil;
+
 import com.ym.mec.util.http.HttpUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -29,6 +33,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import java.math.BigDecimal;
 import java.util.*;
+import java.util.stream.Collectors;
 
 @Service
 public class ReplacementInstrumentActivityServiceImpl extends BaseServiceImpl<Integer, ReplacementInstrumentActivity> implements ReplacementInstrumentActivityService {
@@ -66,6 +71,14 @@ public class ReplacementInstrumentActivityServiceImpl extends BaseServiceImpl<In
     @Autowired
     private ReplacementInstrumentCooperationDao replacementInstrumentCooperationDao;
     @Autowired
+    private GoodsDao goodsDao;
+    @Autowired
+    private GoodsService goodsService;
+    @Autowired
+    private SysPaymentConfigService sysPaymentConfigService;
+    @Autowired
+    private SellOrderDao sellOrderDao;
+    @Autowired
     private QuestionnaireUserResultDao questionnaireUserResultDao;
     @Autowired
     private QuestionnaireQuestionDao questionnaireQuestionDao;
@@ -86,6 +99,7 @@ public class ReplacementInstrumentActivityServiceImpl extends BaseServiceImpl<In
         if (sysUser == null) {
             throw new BizException("用户信息获取失败，请重新登陆");
         }
+        replacementInstrumentActivity.setGoodsId(replacementInstrumentActivity.getInstrumentsId());
         replacementInstrumentActivity.setUserId(sysUser.getId());
         //如果用户是43分部，那么修改用户信息
         if (sysUser.getOrganId() == 43) {
@@ -119,7 +133,8 @@ public class ReplacementInstrumentActivityServiceImpl extends BaseServiceImpl<In
         }
         //已开启缴费推送购买链接
         if (sendPush && replacementInstrumentActivity.getOpenFlag().equals(1) && replacementInstrumentActivity.getInstrumentsId() != null) {
-            ReplacementInstrument replacementInstrument = replacementInstrumentDao.get(replacementInstrumentActivity.getInstrumentsId());
+            //换成商品列表中商品4.25
+            Goods goods = goodsDao.get(replacementInstrumentActivity.getGoodsId());
             Map<Integer, String> userMap = new HashMap<>();
             Map<Integer, String> userPhoneMap = new HashMap<>();
             Integer userId = replacementInstrumentActivity.getUserId();
@@ -127,11 +142,11 @@ public class ReplacementInstrumentActivityServiceImpl extends BaseServiceImpl<In
             String pushUrl = baseApiUrl + "/#/questionGoodsSale?id=";
             userMap.put(userId, userId.toString());
             sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.REPLACEMENT_PAY_PUSH,
-                    userMap, null, 0, "5?" + pushUrl + replacementInstrumentActivity.getId(), "STUDENT", replacementInstrument.getBrand(), "");
+                    userMap, null, 0, "5?" + pushUrl + replacementInstrumentActivity.getId(), "STUDENT", goods.getBrand(), "");
 
             userPhoneMap.put(replacementInstrumentActivity.getUserId(), replacementInstrumentActivity.getMobileNo());
             sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.AWSMS, MessageTypeEnum.REPLACEMENT_PAY_PUSH,
-                    userPhoneMap, null, 0, null, "STUDENT", replacementInstrument.getBrand(), HttpUtil.getSortUrl(pushUrl + replacementInstrumentActivity.getId()));
+                    userPhoneMap, null, 0, null, "STUDENT", goods.getBrand(), HttpUtil.getSortUrl(pushUrl + replacementInstrumentActivity.getId()));
         }
         return replacementInstrumentActivity;
     }
@@ -213,6 +228,7 @@ public class ReplacementInstrumentActivityServiceImpl extends BaseServiceImpl<In
         return replacementInstrumentActivity;
     }
 
+
     @Override
     public ReplacementInstrumentActivity findByUserId(Integer cooperationOrganId, Integer userId,Integer cooperationId) {
         return replacementInstrumentActivityDao.findByUserId(cooperationOrganId, userId,cooperationId);
@@ -253,6 +269,10 @@ public class ReplacementInstrumentActivityServiceImpl extends BaseServiceImpl<In
         ReplacementInstrumentActivity replacementInstrumentActivity = replacementInstrumentActivityDao.getLock(replacementPayDto.getId());
         Integer userId = replacementInstrumentActivity.getUserId();
 
+        if (replacementInstrumentActivity.getGoodsId() == null) {
+            throw new BizException("数据维护中,请稍后支付");
+        }
+
         //处理关闭订单
         if (replacementInstrumentActivity.getPayStatus().equals(1) && replacementPayDto.getRePay()) {
             StudentPaymentOrder oldOrder = studentPaymentOrderService.getUserReplacementIngOrder(userId, replacementInstrumentActivity.getId());
@@ -263,10 +283,10 @@ public class ReplacementInstrumentActivityServiceImpl extends BaseServiceImpl<In
             }
         }
 
-        ReplacementInstrument replacementInstrument = replacementInstrumentDao.get(replacementInstrumentActivity.getInstrumentsId());
-        BigDecimal orderAmount = replacementInstrument.getSalePrice();
+        Goods goods = goodsDao.get(replacementInstrumentActivity.getInstrumentsId());
+        BigDecimal orderAmount = goods.getGroupPurchasePrice();
         BigDecimal amount = replacementPayDto.getAmount(); //扣除余额之前的金额
-        if (amount.compareTo(replacementInstrument.getSalePrice()) != 0) {
+        if (amount.compareTo(orderAmount) != 0) {
             throw new BizException("商品价格不符");
         }
 
@@ -413,6 +433,8 @@ public class ReplacementInstrumentActivityServiceImpl extends BaseServiceImpl<In
                 rechargeDetail.setChannel(studentPaymentOrder.getPaymentChannel());
                 sysUserCashAccountDetailService.insert(paymentDetail);
             }
+            //添加sell_order
+            this.addSellOrder(studentPaymentOrder, replacementInstrumentActivity);
             try {
                 contractService.transferProduceContract(userId, null);
             } catch (Exception e) {
@@ -470,6 +492,67 @@ public class ReplacementInstrumentActivityServiceImpl extends BaseServiceImpl<In
         return pageInfo;
     }
 
+    private List<SellOrder> addSellOrder(StudentPaymentOrder order, ReplacementInstrumentActivity replacementInstrumentActivity) {
+        if (replacementInstrumentActivity.getGoodsId() == null) {
+            return null;
+        }
+        List<Goods> goodies = new ArrayList<>();
+        Goods goods = goodsDao.get(replacementInstrumentActivity.getInstrumentsId());
+        goodies.add(goods);
+        if (goods.getComplementGoodsIdList() != null) {
+            goodies = goodsDao.findGoodsByIds(goods.getComplementGoodsIdList());
+        }
+        Map<Integer, BigDecimal> groupPurchasePriceMap = goodies.stream().collect(Collectors.toMap(Goods::getId, Goods::getGroupPurchasePrice));
+        BigDecimal goodsTotalPrice = goodies.stream().map(Goods::getGroupPurchasePrice).reduce(BigDecimal.ZERO, BigDecimal::add);
+        Map<Integer, GoodsType> goodsTypeMap = goodies.stream().collect(Collectors.toMap(Goods::getId, Goods::getType));
+
+        AccountType accountType = sysPaymentConfigService.checkAccountType(PaymentChannelEnum.valueOf(order.getPaymentChannel()), order.getMerNos());
+
+        List<Integer> goodsIds = new ArrayList<>();
+        goodsIds.add(goods.getId());
+        List<SellOrder> sellOrders = goodsService.subtractStock(goodsIds, accountType);
+
+        BigDecimal hasRouteSellOrderExpectAmount = BigDecimal.ZERO; //已分配预计金额
+        BigDecimal hasRouteSellOrderBalance = BigDecimal.ZERO; //已分配余额
+
+        int i = 1;
+        for (SellOrder sellOrder : sellOrders) {
+            BigDecimal sellOrderExpectAmount = order.getExpectAmount().compareTo(BigDecimal.ZERO) <= 0 ? BigDecimal.ZERO : groupPurchasePriceMap.get(sellOrder.getGoodsId()).multiply(order.getExpectAmount()).divide(goodsTotalPrice, 2, BigDecimal.ROUND_DOWN);
+            BigDecimal sellOrderBalance = order.getExpectAmount().compareTo(BigDecimal.ZERO) <= 0 ? BigDecimal.ZERO : groupPurchasePriceMap.get(sellOrder.getGoodsId()).multiply(order.getBalancePaymentAmount()).divide(goodsTotalPrice, 2, BigDecimal.ROUND_DOWN);
+            if (i == sellOrders.size()) {
+                sellOrderExpectAmount = order.getExpectAmount().subtract(hasRouteSellOrderExpectAmount);
+                sellOrderBalance = order.getBalancePaymentAmount().subtract(hasRouteSellOrderBalance);
+            }
+            sellOrder.setOrganId(order.getOrganId());
+            sellOrder.setTransNo(order.getTransNo());
+            sellOrder.setOrderId(order.getId());
+            sellOrder.setCooperationOrganId(replacementInstrumentActivity.getCooperationOrganId());
+            sellOrder.setOrderNo(order.getOrderNo());
+            sellOrder.setActualAmount(sellOrderExpectAmount.subtract(sellOrderBalance));
+            sellOrder.setBalanceAmount(sellOrderBalance);
+            sellOrder.setExpectAmount(sellOrderExpectAmount);
+            sellOrder.setNum(1);
+            sellOrder.setUserId(order.getUserId());
+            sellOrder.setPaymentChannel(order.getPaymentChannel());
+            sellOrder.setMerNo(order.getMerNos());
+            sellOrder.setSellTime(order.getCreateTime());
+            sellOrder.setCreateIme(new Date());
+            sellOrder.setUpdateTime(new Date());
+            if (goodsTypeMap.get(sellOrder.getGoodsId()).equals(GoodsType.INSTRUMENT)) {
+                sellOrder.setType(SellTypeEnum.INSTRUMENT);
+            } else if (goodsTypeMap.get(sellOrder.getGoodsId()).equals(GoodsType.ACCESSORIES)) {
+                sellOrder.setType(SellTypeEnum.ACCESSORIES);
+            } else {
+                sellOrder.setType(SellTypeEnum.OTHER);
+            }
+            i++;
+        }
+        if (sellOrders.size() > 0) {
+            sellOrderDao.batchInsert(sellOrders);
+        }
+        return sellOrders;
+    }
+
     @Transactional(rollbackFor = Exception.class)
     public void resultSync(){
         //获取所有问卷结果

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ReplacementInstrumentServiceImpl.java

@@ -1,22 +1,51 @@
 package com.ym.mec.biz.service.impl;
 
+import com.ym.mec.biz.dal.dao.GoodsDao;
+import com.ym.mec.biz.dal.entity.Goods;
+import com.ym.mec.biz.dal.page.ReplacementInstrumentQueryInfo;
 import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
+import com.ym.mec.util.collection.MapUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import com.ym.mec.biz.dal.entity.ReplacementInstrument;
 import com.ym.mec.biz.service.ReplacementInstrumentService;
 import com.ym.mec.biz.dal.dao.ReplacementInstrumentDao;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 @Service
 public class ReplacementInstrumentServiceImpl extends BaseServiceImpl<Integer, ReplacementInstrument> implements ReplacementInstrumentService {
 
-	@Autowired
-	private ReplacementInstrumentDao replacementInstrumentDao;
+    @Autowired
+    private ReplacementInstrumentDao replacementInstrumentDao;
+    @Autowired
+    private GoodsDao goodsDao;
+
+    @Override
+    public BaseDAO<Integer, ReplacementInstrument> getDAO() {
+        return replacementInstrumentDao;
+    }
+
+    @Override
+    public PageInfo<ReplacementInstrument> getPageList(ReplacementInstrumentQueryInfo queryInfo) {
+        PageInfo<ReplacementInstrument> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
+        Map<String, Object> params = new HashMap<String, Object>();
+        MapUtil.populateMap(params, queryInfo);
 
-	@Override
-	public BaseDAO<Integer, ReplacementInstrument> getDAO() {
-		return replacementInstrumentDao;
-	}
+        List<ReplacementInstrument> dataList = new ArrayList<>();
+        int count = goodsDao.getReplacementInstrumentCount(params);
 
+        if (count > 0) {
+            pageInfo.setTotal(count);
+            params.put("offset", pageInfo.getOffset());
+            dataList = goodsDao.getReplacementGoodsPage(params);
+        }
+        pageInfo.setRows(dataList);
+        return pageInfo;
+    }
 }

mec-biz/src/main/resources/config/mybatis/GoodsMapper.xml

@@ -38,6 +38,7 @@
         <result column="client_show_" property="clientShow" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="educational_show_" property="educationalShow" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="music_group_show_" property="musicGroupShow" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result column="replacement_show_" property="replacementShow" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="stock_warning_" property="stockWarning" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
     </resultMap>
 
@@ -61,20 +62,20 @@
         INSERT INTO goods
         (goods_category_id_,sn_,name_,brand_,specification_,image_,stock_count_,tax_stock_count_,sell_count_,market_price_,
         discount_price_,group_purchase_price_,brief_,desc_,is_new_,is_top_,status_,memo_,publish_time_,
-        complement_goods_id_list_,update_time_,create_time_,type_,agree_cost_price_,client_show_,educational_show_,music_group_show_,stock_warning_,stock_type_)
+        complement_goods_id_list_,update_time_,create_time_,type_,agree_cost_price_,client_show_,educational_show_,music_group_show_,replacement_show_,stock_warning_,stock_type_)
         VALUES(#{goodsCategoryId},#{sn},#{name},#{brand},#{specification},#{image},#{stockCount},#{taxStockCount},#{sellCount},#{marketPrice},
         #{discountPrice},#{groupPurchasePrice},#{brief},#{desc},
         #{isNew,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{isTop,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
         #{memo},#{publishTime},#{complementGoodsIdList},now(),now(),#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{agreeCostPrice},
         #{clientShow,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{educationalShow,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-        #{musicGroupShow,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{stockWarning,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-        #{stockType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler})
+        #{musicGroupShow,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{replacementShow,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+        #{stockWarning,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}, #{stockType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler})
     </insert>
     <insert id="batchInsert" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
         INSERT INTO goods
         (goods_category_id_,name_,brand_,specification_,image_,market_price_,
         discount_price_,group_purchase_price_,brief_,desc_,update_time_,create_time_,type_,agree_cost_price_,sn_,
-        stock_count_,tax_stock_count_,client_show_,educational_show_,music_group_show_,stock_warning_,stock_type_)
+        stock_count_,tax_stock_count_,client_show_,educational_show_,music_group_show_,replacement_show_,stock_warning_,stock_type_)
         VALUES
         <foreach collection="list" separator="," item="goods">
             (#{goods.goodsCategoryId},#{goods.name},#{goods.brand},#{goods.specification},#{goods.image},#{goods.marketPrice},
@@ -83,6 +84,7 @@
             #{goods.stockCount},#{goods.taxStockCount},#{goods.clientShow,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             #{goods.educationalShow,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
         	#{goods.musicGroupShow,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+        	#{goods.replacementShow,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             #{goods.stockWarning,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             #{goods.stockType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler})
         </foreach>
@@ -166,6 +168,9 @@
             <if test="musicGroupShow != null">
                 music_group_show_ = #{musicGroupShow,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             </if>
+            <if test="replacementShow != null">
+                replacement_show_ = #{replacementShow,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+            </if>
             <if test="stockWarning != null">
                 stock_warning_ = #{stockWarning,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             </if>
@@ -256,6 +261,9 @@
 	            <if test="goods.musicGroupShow != null">
 	                music_group_show_ = #{goods.musicGroupShow,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
 	            </if>
+                <if test="goods.replacementShow != null">
+                    music_group_show_ = #{goods.replacementShow,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+                </if>
                 <if test="goods.stockWarning != null">
                     stock_warning_ = #{goods.stockWarning,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
                 </if>
@@ -319,6 +327,9 @@
             <if test="musicGroupShow!=null">
                 AND g.music_group_show_=#{musicGroupShow}
             </if>
+            <if test="replacementShow!=null">
+                AND g.replacement_show_=#{replacementShow}
+            </if>
             <if test="search!=null and search!=''">
                 AND (g.sn_=#{search} OR g.id_=#{search} OR g.name_ LIKE CONCAT('%', #{search}, '%'))
             </if>
@@ -433,4 +444,39 @@
     <select id="getGoodsByBaseGoodsId" resultMap="Goods">
         SELECT * FROM goods WHERE FIND_IN_SET(#{goodsId}, complement_goods_id_list_)
     </select>
+
+    <!-- 根据分部获取乐器置换的商品-->
+    <select id="getReplacementGoodsPage" resultMap="com.ym.mec.biz.dal.dao.ReplacementInstrumentDao.ReplacementInstrument">
+        SELECT g.id_,g.brand_,g.specification_,g.brief_ param_,g.market_price_,g.discount_price_,g.group_purchase_price_ sale_price_,
+        (g.discount_price_-g.group_purchase_price_) depreciation_price_
+        FROM subject_goods_mapper sgm
+        LEFT JOIN goods g ON sgm.goods_category_id_ = g.goods_category_id_
+        <include refid="replacementQuerySql"/>
+        <include refid="global.limit"/>
+    </select>
+
+    <select id="getReplacementInstrumentCount" resultType="int">
+        SELECT COUNT(*)
+        FROM subject_goods_mapper sgm
+        LEFT JOIN goods g ON sgm.goods_category_id_ = g.goods_category_id_
+        <include refid="replacementQuerySql"/>
+        <include refid="global.limit"/>
+    </select>
+
+    <sql id="replacementQuerySql">
+        <where>
+            g.replacement_show_ = 1
+            AND g.status_ != 0
+            AND g.type_ = 'INSTRUMENT'
+            <if test="subjectId != null">
+                AND sgm.subject_id_ = #{subjectId}
+            </if>
+            <if test="brand != null and brand!=''">
+                AND g.brand_ = #{brand}
+            </if>
+            <if test="specification != null and specification!=''">
+                AND g.specification_ = #{specification}
+            </if>
+        </where>
+    </sql>
 </mapper>

mec-biz/src/main/resources/config/mybatis/InspectionItemPlanMapper.xml

@@ -8,6 +8,7 @@
         <result column="inspection_id_" property="inspectionId"/>
         <result column="item_id_" property="itemId"/>
         <result column="user_id_" property="userId"/>
+        <result column="operator_user_id_" property="operatorUserId"/>
         <result column="plan_start_" property="planStart"/>
         <result column="plan_end_" property="planEnd"/>
         <result column="organ_id_" property="organId"/>
@@ -26,17 +27,9 @@
         <result column="organName" property="organName"/>
         <result column="realName" property="realName"/>
     </resultMap>
-    <sql id="Base_Column_List">
-        <!--@mbg.generated-->
-        id_, inspection_id_, item_id_, user_id_, plan_start_, plan_end_,organ_id_, cooperation_organ_id_,
-        music_group_id_, school_gps_, submited_gps_, submited_time_, memo_, conclusion_status_, status_, create_time_,
-        update_time_
-    </sql>
     <select id="get" parameterType="java.lang.Long" resultMap="InspectionItemPlan">
         <!--@mbg.generated-->
-        select
-        <include refid="Base_Column_List"/>
-        from inspection_item_plan
+        select * from inspection_item_plan
         where id_ = #{id}
     </select>
     <delete id="delete" parameterType="java.lang.Long">
@@ -47,11 +40,11 @@
     <insert id="insert" keyColumn="id_" keyProperty="id" parameterType="com.ym.mec.biz.dal.entity.InspectionItemPlan"
             useGeneratedKeys="true">
         <!--@mbg.generated-->
-        insert into inspection_item_plan (inspection_id_, item_id_, user_id_, plan_start_, plan_end_,
+        insert into inspection_item_plan (inspection_id_, item_id_, user_id_,operator_user_id_, plan_start_, plan_end_,
         organ_id_,cooperation_organ_id_,
         music_group_id_, school_gps_, submited_gps_, submited_time_, memo_, conclusion_status_, status_,
         create_time_, update_time_)
-        values (#{inspectionId}, #{itemId}, #{userId}, #{planStart}, #{planEnd}, #{organId},#{cooperationOrganId},
+        values (#{inspectionId}, #{itemId}, #{userId},#{operatorUserId}, #{planStart}, #{planEnd}, #{organId},#{cooperationOrganId},
         #{musicGroupId}, #{schoolGps}, #{submitedGps}, #{submitedTime}, #{memo},#{conclusionStatus},#{status},
         #{createTime}, #{updateTime})
     </insert>
@@ -68,6 +61,9 @@
             <if test="userId != null">
                 user_id_ = #{userId},
             </if>
+            <if test="operatorUserId != null">
+                operator_user_id_ = #{userId},
+            </if>
             <if test="planStart != null">
                 plan_start_ = #{planStart},
             </if>

mec-biz/src/main/resources/config/mybatis/ReplacementInstrumentActivityMapper.xml

@@ -20,6 +20,7 @@
         <result column="subject_id_" property="subjectId"/>
         <result column="question_result_" property="questionResult"/>
         <result column="instruments_id_" property="instrumentsId"/>
+        <result column="goods_id_" property="goodsId"/>
         <result column="other_suggestion_" property="otherSuggestion"/>
         <result column="open_flag_" property="openFlag"/>
         <result column="pay_status_" property="payStatus"/>
@@ -60,9 +61,9 @@
             keyColumn="id" keyProperty="id">
         INSERT INTO replacement_instrument_activity (cooperation_organ_id_, user_id_, user_name_, grade_, classes_,
                                                      mobile_no_, subject_id_, question_result_, instruments_id_,
-                                                     other_suggestion_,topic_id_,replacement_instrument_cooperation_id_, create_time_, update_time_)
+                                                     goods_id_,other_suggestion_,topic_id_,replacement_instrument_cooperation_id_,create_time_, update_time_)
         VALUES (#{cooperationOrganId}, #{userId}, #{userName}, #{grade}, #{classes}, #{mobileNo}, #{subjectId},
-                #{questionResult}, #{instrumentsId}, #{otherSuggestion}, #{topicId},#{replacementInstrumentCooperationId}, NOW(), NOW())
+                #{questionResult}, #{instrumentsId}, #{goodsId}, #{otherSuggestion}, #{topicId},#{replacementInstrumentCooperationId}, NOW(), NOW())
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -100,6 +101,7 @@
                 update_time_ = #{updateTime},
             </if>
             instruments_id_ = #{instrumentsId},
+            goods_id_ = #{goodsId},
             other_suggestion_ = #{otherSuggestion},
             <if test="mobileNo != null">
                 mobile_no_ = #{mobileNo},
@@ -164,10 +166,10 @@
                 AND ria.question_result_ LIKE CONCAT('0', '%')
             </if>
             <if test="brand!=null and brand!=''">
-                AND ri.brand_ = #{brand}
+                AND g.brand_ = #{brand}
             </if>
             <if test="specification!=null and specification!=''">
-                AND ri.specification_ = #{specification}
+                AND g.specification_ = #{specification}
             </if>
             <if test="organId != null">
                 AND FIND_IN_SET(o.id_ , #{organId})
@@ -176,7 +178,8 @@
                 AND (ria.mobile_no_ LIKE CONCAT('%', #{search}, '%') OR ria.user_name_ LIKE CONCAT('%', #{search}, '%'))
             </if>
             <if test="cooperationOrganIdOrName!=null and cooperationOrganIdOrName!=''">
-                AND (ria.cooperation_organ_id_ = #{cooperationOrganIdOrName} OR co.name_ LIKE CONCAT('%', #{cooperationOrganIdOrName}, '%'))
+                AND (ria.cooperation_organ_id_ = #{cooperationOrganIdOrName} OR co.name_ LIKE CONCAT('%',
+                #{cooperationOrganIdOrName}, '%'))
             </if>
             <if test="payStatus!=null">
                 AND ria.pay_status_ = #{payStatus}
@@ -188,11 +191,11 @@
         SELECT
         ria.*,
         sub.name_ subject_name_,
-        ri.brand_,
-        ri.specification_
+        g.brand_,
+        g.specification_
         FROM
         replacement_instrument_activity ria
-        LEFT JOIN replacement_instrument ri ON ria.instruments_id_ = ri.id_
+        LEFT JOIN goods g ON ria.instruments_id_ = g.id_
         LEFT JOIN `subject` sub ON ria.subject_id_ = sub.id_
         <include refid="queryReplacementsCondition"/>
         ORDER BY ria.id_ DESC
@@ -204,7 +207,7 @@
         COUNT(ria.id_)
         FROM
         replacement_instrument_activity ria
-        LEFT JOIN replacement_instrument ri ON ria.instruments_id_ = ri.id_
+        LEFT JOIN goods g ON ria.instruments_id_ = g.id_
         LEFT JOIN `subject` sub ON ria.subject_id_ = sub.id_
         <include refid="queryReplacementsCondition"/>
     </select>
@@ -242,10 +245,10 @@
     </select>
 
     <select id="getPushUsers" resultMap="ReplacementInstrumentActivityStatDto">
-        SELECT ria.id_,ria.user_id_, su.phone_ mobile_no_, ri.brand_
+        SELECT ria.id_, ria.user_id_, su.phone_ mobile_no_, g.brand_
         FROM replacement_instrument_activity ria
                  LEFT JOIN sys_user su ON su.id_ = ria.user_id_
-                 LEFT JOIN replacement_instrument ri ON ri.id_ = ria.instruments_id_
+                 LEFT JOIN goods g ON g.id_ = ria.instruments_id_
         WHERE cooperation_organ_id_ = #{cooperationOrganId}
           AND open_flag_ = 0
           AND instruments_id_ > 0
@@ -253,27 +256,35 @@
 
     <select id="getInfo" resultMap="ReplacementInstrumentActivityStatDto">
         SELECT ria.*,
-               ri.brand_,
-               ri.specification_,
-               ri.param_,
-               ri.market_price_,
-               ri.discount_price_,
-               ri.depreciation_price_,
-               ri.sale_price_,
-               s.name_ subject_name_,
-               co.name_ cooperationOrganName
+               g.brand_,
+               g.specification_,
+               g.brief_                                      param_,
+               g.market_price_,
+               g.discount_price_,
+               g.group_purchase_price_                       sale_price_,
+               (g.discount_price_ - g.group_purchase_price_) depreciation_price_,
+               s.name_                                       subject_name_,
+               co.name_                                      cooperationOrganName
         FROM replacement_instrument_activity ria
-                 LEFT JOIN replacement_instrument ri ON ri.id_ = ria.instruments_id_
-                 LEFT JOIN subject s ON s.id_ = ri.subject_id_
+                 LEFT JOIN goods g ON g.id_ = ria.instruments_id_
+                 LEFT JOIN subject s ON s.id_ = ria.subject_id_
                  LEFT JOIN cooperation_organ co ON co.id_ = ria.cooperation_organ_id_
         WHERE ria.id_ = #{id}
     </select>
 
     <!-- 获取问卷分页数据 -->
     <select id="getPageList" resultMap="ReplacementInstrumentActivityStatDto" parameterType="map">
-        SELECT ria.*,su.phone_ mobile_no_,o.name_ organ_name_,ri.brand_,ri.specification_,ri.param_,ri.market_price_,ri.discount_price_,ri.depreciation_price_,
-        ri.sale_price_,s.name_ subject_name_,co.name_ cooperationOrganName FROM replacement_instrument_activity ria
-        LEFT JOIN replacement_instrument ri ON ri.id_ = ria.instruments_id_
+        SELECT ria.*,su.phone_ mobile_no_,o.name_
+        organ_name_,
+        g.brand_,
+        g.specification_,
+        g.brief_ param_,
+        g.market_price_,
+        g.discount_price_,
+        g.group_purchase_price_ sale_price_,
+        (g.discount_price_ - g.group_purchase_price_) depreciation_price_,
+        s.name_ subject_name_,co.name_ cooperationOrganName FROM replacement_instrument_activity ria
+        LEFT JOIN goods g ON g.id_ = ria.instruments_id_
         LEFT JOIN subject s ON s.id_ = ria.subject_id_
         lEFT JOIN sys_user su ON su.id_ = ria.user_id_
         LEFT JOIN cooperation_organ co ON co.id_ = ria.cooperation_organ_id_
@@ -287,7 +298,7 @@
     <select id="getCount" resultType="int">
         SELECT COUNT(*)
         FROM replacement_instrument_activity ria
-        LEFT JOIN replacement_instrument ri ON ri.id_ = ria.instruments_id_
+        LEFT JOIN goods g ON g.id_ = ria.instruments_id_
         LEFT JOIN cooperation_organ co on co.id_ = ria.cooperation_organ_id_
         LEFT JOIN organization o on o.id_ = co.organ_id_
         <include refid="queryReplacementsCondition"/>

mec-biz/src/main/resources/config/mybatis/StudentRegistrationMapper.xml

@@ -288,6 +288,15 @@
             <if test="actualSubjectId != null">
                 AND sr.actual_subject_id_ = #{actualSubjectId}
             </if>
+            <if test="paymentStatus != null">
+                AND sr.payment_status_ = #{paymentStatus}
+            </if>
+            <if test="visited!= null and visited==true">
+                AND sv.num >0
+            </if>
+            <if test="visited!= null and visited==false">
+                AND sv.num IS NULL
+            </if>
             <if test="name != null">
                 AND (sr.name_ LIKE CONCAT('%',#{name},'%') OR sr.parents_phone_ LIKE CONCAT('%',#{name},'%'))
             </if>
@@ -317,20 +326,27 @@
         <result column="id_" property="id"/>
         <result column="remark_" property="remark"/>
         <result column="create_time_" property="createTime"/>
+        <result column="visit_num_" property="visitNum"/>
     </resultMap>
     <select id="queryStudentDetailPage" resultMap="studentApplyDetail">
         SELECT sr.id_,sr.create_time_, sr.user_id_,su.username_ username_,sr.parents_name_,sr.current_class_,sr.current_grade_,sr.current_grade_date_,
         su.gender_,sr.is_allow_adjust_, s.name_ subject_name_,ss.name_
-        actual_subject_name_,su.phone_ parents_phone_,sr.payment_status_,sr.remark_,sr.actual_subject_id_
+        actual_subject_name_,su.phone_ parents_phone_,sr.payment_status_,sr.remark_,sr.actual_subject_id_,IFNULL(sv.num,0) visit_num_
         FROM student_registration sr
         LEFT JOIN sys_user su ON sr.user_id_ = su.id_
         LEFT JOIN `subject` s ON sr.subject_id_ = s.id_
         LEFT JOIN `subject` ss ON sr.actual_subject_id_ = ss.id_
+        LEFT JOIN (
+            SELECT v.student_id_, COUNT(*) num FROM student_visit v WHERE v.music_group_id_ = #{musicGroupId} GROUP BY v.student_id_
+        ) sv ON sv.student_id_=sr.user_id_
         <include refid="queryStudentDetailPageSql"/>
         <include refid="global.limit"/>
     </select>
     <select id="queryStudentDetailCount" resultType="java.lang.Integer">
         SELECT COUNT(sr.id_) FROM student_registration sr
+        LEFT JOIN (
+            SELECT v.student_id_, COUNT(*) num FROM student_visit v WHERE v.music_group_id_ = #{musicGroupId} GROUP BY v.student_id_
+        ) sv on sv.student_id_=sr.user_id_
         <include refid="queryStudentDetailPageSql"/>
     </select>
 

mec-student/src/main/java/com/ym/mec/student/controller/ReplacementInstrumentController.java

@@ -1,5 +1,8 @@
 package com.ym.mec.student.controller;
 
+import com.ym.mec.biz.dal.entity.ReplacementInstrument;
+import com.ym.mec.common.entity.HttpResponseResult;
+import com.ym.mec.common.page.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
@@ -26,12 +29,12 @@ public class ReplacementInstrumentController extends BaseController {
 
     @ApiOperation(value = "分页查询列表")
     @GetMapping("/queryPage")
-    public Object queryPage(ReplacementInstrumentQueryInfo queryInfo) {
+    public HttpResponseResult<PageInfo<ReplacementInstrument>> queryPage(ReplacementInstrumentQueryInfo queryInfo) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
-        return succeed(replacementInstrumentService.queryPage(queryInfo));
+        return succeed(replacementInstrumentService.getPageList(queryInfo));
     }
 
 }

mec-web/src/main/java/com/ym/mec/web/config/ResourceServerConfig.java

@@ -34,7 +34,8 @@ public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
 				.antMatchers("/task/**")
 				.hasIpAddress("0.0.0.0/0")
 				.antMatchers("/v2/api-docs", "/classGroup/highClassGroups", "/code/*", "/api/*", "/appVersionInfo/queryByPlatform", "/eduDegree/*",
-						"/uploadFile", "/eduContracts/queryProduceContract","/activity/doubleEleven2020Statis", "/replacementInstrumentActivity/queryReplacementsStat").permitAll().anyRequest().authenticated().and().httpBasic();
+						"/uploadFile", "/eduContracts/queryProduceContract","/activity/doubleEleven2020Statis","/replacementInstrument/queryPage",
+						"/replacementInstrumentActivity/queryReplacementsStat").permitAll().anyRequest().authenticated().and().httpBasic();
 	}
 
 	@Override

mec-web/src/main/java/com/ym/mec/web/controller/ExportController.java

@@ -217,11 +217,11 @@ public class ExportController extends BaseController {
         OutputStream outputStream = response.getOutputStream();
         try {
             HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"商品编号", "货号", "品牌", "商品名称",
-                    "是否组合商品", "学员是否展示", "教务端是否展示", "乐团是否展示", "是否库存预警",
+                    "是否组合商品", "学员是否展示", "教务端是否展示", "乐团是否展示","是否乐器置换", "是否库存预警",
                     "商品类型", "商品分类", "具体型号", "内部库存", "税务库存", "库存类型", "市场价(元)",
                     "零售价(元)", "商品团购价(元)", "商品描述", "商品详情", "是否上下架"}, new String[]{
                     "id", "sn", "brand", "name",
-                    "complementGoodsIdList == null || complementGoodsIdList == '' ? '否':'是'", "clientShow.msg", "educationalShow.msg", "musicGroupShow.msg", "stockWarning.msg",
+                    "complementGoodsIdList == null || complementGoodsIdList == '' ? '否':'是'", "clientShow.msg", "educationalShow.msg", "musicGroupShow.msg","replacementShow.msg", "stockWarning.msg",
                     "type.desc", "goodsCategoryName", "specification", "stockCount", "taxStockCount", "stockType.msg", "marketPrice",
                     "discountPrice", "groupPurchasePrice", "brief", "desc", "status.msg"}, rows);
             response.setContentType("application/octet-stream");

mec-web/src/main/java/com/ym/mec/web/controller/InspectionItemPlanController.java

@@ -47,7 +47,7 @@ public class InspectionItemPlanController extends BaseController {
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
-        inspectionItemPlan.setUserId(sysUser.getId());
+        inspectionItemPlan.setOperatorUserId(sysUser.getId());
         return succeed(inspectionItemPlanService.add(inspectionItemPlan));
     }
 
@@ -59,7 +59,7 @@ public class InspectionItemPlanController extends BaseController {
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
-        inspectionItemPlan.setUserId(sysUser.getId());
+        inspectionItemPlan.setOperatorUserId(sysUser.getId());
         inspectionItemPlanService.updatePlan(inspectionItemPlan);
         return succeed(inspectionItemPlan);
     }
@@ -72,27 +72,24 @@ public class InspectionItemPlanController extends BaseController {
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
-            Employee employee = employeeDao.get(sysUser.getId());
-            if (StringUtils.isEmpty(queryInfo.getOrganId())) {
-                queryInfo.setOrganId(employee.getOrganIdList());
-            } else if (StringUtils.isEmpty(employee.getOrganIdList())) {
-                return failed("用户所在分部异常");
-            } else {
-                List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
-                if (!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))) {
-                    return failed("非法请求");
-                }
+        Employee employee = employeeDao.get(sysUser.getId());
+        if (StringUtils.isEmpty(queryInfo.getOrganId())) {
+            queryInfo.setOrganId(employee.getOrganIdList());
+        } else if (StringUtils.isEmpty(employee.getOrganIdList())) {
+            return failed("用户所在分部异常");
+        } else {
+            List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
+            if (!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))) {
+                return failed("非法请求");
             }
+        }
         if (queryInfo.getStartTime() != null) {
             queryInfo.setStartTime(DateUtil.trunc(queryInfo.getStartTime()));
         }
         if (queryInfo.getEndTime() != null) {
             queryInfo.setEndTime(DateUtil.getLastTimeWithDay(queryInfo.getEndTime()));
         }
-        if (queryInfo.getItemId() != null) {
-            queryInfo.setUserId(sysUser.getId());
-        }
-        String startTime = DateUtil.format(DateUtil.getFirstDayOfMonth(DateUtil.addMonths(new Date(), -2)),DateUtil.ISO_EXPANDED_DATE_FORMAT);
+        String startTime = DateUtil.format(DateUtil.getFirstDayOfMonth(DateUtil.addMonths(new Date(), -2)), DateUtil.ISO_EXPANDED_DATE_FORMAT);
         queryInfo.setSearchStartTime(startTime);
         return succeed(inspectionItemPlanService.queryPage(queryInfo));
     }
@@ -109,6 +106,7 @@ public class InspectionItemPlanController extends BaseController {
         InspectionItemPlan inspectionItemPlan = inspectionItemPlanService.get(id);
         inspectionItemPlan.setMemo(memo);
         inspectionItemPlan.setUpdateTime(new Date());
+        inspectionItemPlan.setOperatorUserId(sysUser.getId());
         inspectionItemPlanService.update(inspectionItemPlan);
         return succeed(inspectionItemPlan);
     }
@@ -117,12 +115,8 @@ public class InspectionItemPlanController extends BaseController {
     @ApiOperation(value = "获取乐团主管的乐团")
     @GetMapping("/getMusicGroup")
     @PreAuthorize("@pcs.hasPermissions('inspectionItemPlan/getMusicGroup')")
-    public HttpResponseResult<List<MusicGroup>> getMusicGroup(Integer organId, String search) {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null) {
-            return failed("用户信息获取失败");
-        }
-        return succeed(musicGroupDao.getByEduTeacher(organId, sysUser.getId(), search));
+    public HttpResponseResult<List<MusicGroup>> getMusicGroup(Integer organId,Integer userId, String search) {
+        return succeed(musicGroupDao.getByEduTeacher(organId, userId, search));
     }
 
 }

mec-web/src/main/java/com/ym/mec/web/controller/ReplacementInstrumentActivityController.java

@@ -99,6 +99,7 @@ public class ReplacementInstrumentActivityController extends BaseController {
     @PostMapping("/update")
     @PreAuthorize("@pcs.hasPermissions('replacementInstrumentActivity/update')")
     public HttpResponseResult<ReplacementInstrumentActivity> update(ReplacementInstrumentActivity replacementInstrumentActivity) {
+        replacementInstrumentActivity.setGoodsId(replacementInstrumentActivity.getInstrumentsId());
         ReplacementInstrumentActivity oldReplacementInstrumentActivity = replacementInstrumentActivityDao.getLock(replacementInstrumentActivity.getId());
         if (!oldReplacementInstrumentActivity.getPayStatus().equals(0)) {
             return failed("支付中、已支付的乐器置换，不能修改");
@@ -123,6 +124,7 @@ public class ReplacementInstrumentActivityController extends BaseController {
 
         oldReplacementInstrumentActivity.setSubjectId(replacementInstrumentActivity.getSubjectId());
         oldReplacementInstrumentActivity.setInstrumentsId(replacementInstrumentActivity.getInstrumentsId());
+        oldReplacementInstrumentActivity.setGoodsId(replacementInstrumentActivity.getInstrumentsId());
         oldReplacementInstrumentActivity.setUpdateTime(new Date());
         replacementInstrumentActivityService.update(oldReplacementInstrumentActivity);
 

mec-web/src/main/java/com/ym/mec/web/controller/ReplacementInstrumentController.java

@@ -2,9 +2,12 @@ package com.ym.mec.web.controller;
 
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.entity.ReplacementInstrument;
 import com.ym.mec.biz.dal.page.ReplacementInstrumentQueryInfo;
 import com.ym.mec.biz.service.ReplacementInstrumentService;
 import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.entity.HttpResponseResult;
+import com.ym.mec.common.page.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,13 +26,12 @@ public class ReplacementInstrumentController extends BaseController {
 
     @ApiOperation(value = "分页查询列表")
     @GetMapping("/queryPage")
-    @PreAuthorize("@pcs.hasPermissions('replacementInstrument/queryPage')")
-    public Object queryPage(ReplacementInstrumentQueryInfo queryInfo) {
+    public HttpResponseResult<PageInfo<ReplacementInstrument>> queryPage(ReplacementInstrumentQueryInfo queryInfo) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
-        return succeed(replacementInstrumentService.queryPage(queryInfo));
+        return succeed(replacementInstrumentService.getPageList(queryInfo));
     }
 
 }

mec-web/src/main/resources/columnMapper.ini

@@ -18,6 +18,7 @@
 是否App展示 = clientShow
 是否在教务端展示 = educationalShow
 是否在乐团展示 = musicGroupShow
+是否乐器置换 = replacementShow
 库存类型 = stockType
 商品详情 = desc
 库存预警 = stockWarning