Merge branch 'feature/relation_type_item' of http://47.101.143.145:8090/77975466/pco into feature/relation_type_item

# Conflicts:
#	sp-server/src/main/java/com/pj/project/tb_business/TbBusinessService.java

sp-admin/sa-view/tb-fee-statistics/dayStatsPrint.html

@@ -101,7 +101,7 @@
 
 
     $.ajax({
-      url: 'http://127.0.0.1:8099/pro/TbFeeStatistics/prePrint',
+      url: 'https://pco.aseanbusiness.cn/pro/TbFeeStatistics/prePrint',
       data:{
         isMonth:isMonth,
         isYear:isYear,

sp-admin/sa-view/tb-fee-statistics/detailPrint.html

@@ -93,7 +93,7 @@
     console.log("beginTime"+beginTime);
     console.log(endTime);
     $.ajax({
-      url: 'http://127.0.0.1:8099/pro/TbFeeDetails/prePrint',
+      url: 'https://pco.aseanbusiness.cn/pro/TbFeeDetails/prePrint',
       data:{
         "beginTime":beginTime,
         "endTime":endTime,

sp-admin/sa-view/tb-partner/tb-partner-add.html

@@ -40,6 +40,14 @@
 							<sa-item type="text" name="联系电话" v-model="m.phone" placeholder="请输入联系号码" br></sa-item>
 							<div class="c-item">
 								<label class="c-label">公众号通知：</label>
+								<el-select v-model="messageType" multiple :disabled="currentCustomerId!=='1'">
+									<el-option v-for="good in goodsList" :key="good.id"
+											   :label="good.name" :value="good.id">
+									</el-option>
+								</el-select>
+							</div>
+							<div class="c-item">
+								<label class="c-label">业务项：</label>
 								<el-select v-model="businessType" multiple :disabled="currentCustomerId!=='1'">
 									<el-option v-for="good in goodsList" :key="good.id"
 											   :label="good.name" :value="good.id">
@@ -78,6 +86,7 @@
 					currentCustomerId: '1',
 					type: [],
 					businessType: [],
+					messageType:[],
 					goodsList: [],
 				},
 				methods: {
@@ -109,7 +118,6 @@
 					},
 					// 提交数据 
 					ok: function() {
-						console.log(this.businessType);
 						// 表单校验 
 						let m = this.m;
 						sa.checkNull(m.name, '请输入 [名称]');
@@ -120,8 +128,10 @@
 						sa.checkNull(m.dutyPeople, '请输入 [联系人]');
 						m.type = this.type.join(",")
 						m.businessType = this.businessType.join(",");
+						m.messageType = this.messageType.join(",");
 						sa.checkNull(m.type, '请输入 [类型]');
-						sa.checkNull(m.businessType, '请输入 [业务类型]');
+						sa.checkNull(m.businessType, '请选择 [业务项]');
+						sa.checkNull(m.messageType, '请选择 [公众号通知]');
 						if (this.id <= 0) { // 添加
 							sa.ajax('/TbCostomer/add', m, function(res) {
 								sa.alert('增加成功', this.clean);
@@ -153,6 +163,7 @@
 							this.m = res.data;
 							this.type = this.m.type.split(',')
 							this.businessType = this.m.businessType.split(',')
+							this.messageType = this.m.messageType.split(',')
 							if (res.data == null) {
 								sa.alert('未能查找到 id=' + this.id + " 详细数据");
 							}

sp-server/src/main/java/com/pj/project/tb_business/TbBusinessService.java

@@ -17,7 +17,6 @@ import cn.hutool.log.StaticLog;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.pj.api.bo.OtherBusinessEditBO;
 import com.pj.api.wx.bo.MsgDataBO;
 import com.pj.api.wx.service.WxService;
 import com.pj.constants.UserTypeEnum;
@@ -28,6 +27,7 @@ import com.pj.current.config.WxConfig;
 import com.pj.current.satoken.StpUserUtil;
 import com.pj.project.relation_business_car.RelationBusinessCar;
 import com.pj.project.relation_business_car.RelationBusinessCarService;
+import com.pj.project.relation_type_item.RelationTypeItemService;
 
 import com.pj.project.tb_business_car.TbBusinessCar;
 import com.pj.project.tb_business_car.TbBusinessCarService;
@@ -64,7 +64,6 @@ import com.pj.project4sp.global.BusinessException;
 import com.pj.utils.so.SoMap;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
 import com.pj.utils.sg.*;
@@ -351,7 +350,7 @@ public class TbBusinessService extends ServiceImpl<TbBusinessMapper, TbBusiness>
             String carNoStr = cars.stream().map(TbBusinessCar::getCarNo).collect(Collectors.joining("、"));
             storeMsg(business.getCustomerId(), "业务订单【" + business.getNo() + "】已确认" + DateUtil.now() + "。");
             List<TbBusinessItem> items = tbBusinessItemService.findByBusinessId(id);
-            String bigBusinessType = business.getGoodsId();
+            String messageType = business.getGoodsId();
             items.forEach(item -> {
                 String businessType = item.getBusinessType();
                 //合作伙伴创建+是否下单后付款
@@ -393,7 +392,7 @@ public class TbBusinessService extends ServiceImpl<TbBusinessMapper, TbBusiness>
                         }
                         MsgDataBO msgDataBO = new MsgDataBO("订单号：" + item.getNo(), item.getItemTypeName(),
                                 item.getItemName(), business.getGoodsName(), DateUtil.now(), remark);
-                        List<String> openidList = tbCostomerService.findByBusinessTypeOpenid(businessType, bigBusinessType);
+                        List<String> openidList = tbCostomerService.findByMessageTypeOpenid(businessType, messageType);
                         openidList.forEach(openid -> {
                             String detailUrl = myConfig.getWebDomain() + "/pages/business-item/item-detail?itemId=" + item.getId() + "&openid=" + openid;
                             wxService.sendTemplateMsg(wxConfig.getBusinessNoticeTemplate(), openid, msgDataBO, detailUrl);

sp-server/src/main/java/com/pj/project/tb_costomer/TbCostomer.java

@@ -113,9 +113,14 @@ public class TbCostomer extends Model<TbCostomer> implements Serializable {
     private String type = "0";
 
     /**
+     * 业务项，关联业务项管理表
+     */
+    private String businessType = "1";
+
+    /**
      * 公众号通知类型，关联业务项管理表
      */
-    private String businessType = "2";
+    private String messageType = "1";
 
     @TableField(exist = false)
     private String typeDes;

sp-server/src/main/java/com/pj/project/tb_costomer/TbCostomerMapper.java

@@ -54,5 +54,5 @@ public interface TbCostomerMapper extends BaseMapper <TbCostomer> {
 	List<TbCostomer> getList(SoMap so);
 
 
-    List<String> findByBusinessTypeOpenid(@Param("businessType") String businessType, @Param("bigBusinessType") String bigBusinessType);
+    List<String> findByMessageTypeOpenid(@Param("businessType") String businessType, @Param("messageType") String messageType);
 }

sp-server/src/main/java/com/pj/project/tb_costomer/TbCostomerMapper.xml

@@ -103,10 +103,10 @@
             <otherwise>id desc</otherwise>
         </choose>
     </select>
-    <select id="findByBusinessTypeOpenid" resultType="java.lang.String">
+    <select id="findByMessageTypeOpenid" resultType="java.lang.String">
 		SELECT b.openid from tb_costomer a LEFT JOIN sp_admin b on a.id=b.customer_id
         WHERE a.type like concat('%',#{businessType},'%')
-        and a.business_type like concat('%',#{bigBusinessType},'%')
+        and a.message_type like concat('%',#{messageType},'%')
         and b.openid !='' and b.openid is not null
 	</select>
 

sp-server/src/main/java/com/pj/project/tb_costomer/TbCostomerService.java

@@ -3,15 +3,10 @@ package com.pj.project.tb_costomer;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import cn.hutool.core.date.DateUnit;
-import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.pj.constants.RoleEnum;
-import com.pj.project.tb_district.TbDistrict;
-import com.pj.project.tb_district.TbDistrictService;
 import com.pj.project.tb_init_permission.TbInitPermission;
 import com.pj.project.tb_init_permission.TbInitPermissionService;
 import com.pj.project4sp.SP;
@@ -25,7 +20,6 @@ import com.pj.utils.so.SoMap;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.pj.utils.sg.*;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
@@ -178,8 +172,8 @@ public class TbCostomerService extends ServiceImpl<TbCostomerMapper, TbCostomer>
         spAdminMapper.updateCustomerAdmin(costomer.getId(), 2);
     }
 
-    public List<String> findByBusinessTypeOpenid(String businessType, String bigBusinessType) {
-        return  tbCostomerMapper.findByBusinessTypeOpenid(businessType, bigBusinessType);
+    public List<String> findByMessageTypeOpenid(String businessType, String messageType) {
+        return  tbCostomerMapper.findByMessageTypeOpenid(businessType, messageType);
 
     }
 }

sp-server/src/main/java/com/pj/project/tb_fee_details/TbFeeDetailsController.java

@@ -94,27 +94,32 @@ public class TbFeeDetailsController {
         return AjaxJson.getSuccessData(tbFeeDetailsService.prePrint(so));
     }
 
+    /** 开单员员确认 */
     @RequestMapping("kaiDanConfirm")
     public AjaxJson kaiDanConfirm(){
         List<Long> ids = SoMap.getRequestSoMap().getListByComma("ids", long.class);
         tbFeeDetailsService.kaiDanConfirm(ids);
         return AjaxJson.getSuccess();
     }
+    /** 现场调度员确认 */
     @RequestMapping("diaoDuConfirm")
     public AjaxJson diaoDuConfirm(){
         List<Long> ids = SoMap.getRequestSoMap().getListByComma("ids", long.class);
         tbFeeDetailsService.diaoDuConfirm(ids);
         return AjaxJson.getSuccess();
     }
+    /** 统计稽查员确认 */
     @RequestMapping("jiChaConfirm")
     public AjaxJson jiChaConfirm(){
         List<Long> ids = SoMap.getRequestSoMap().getListByComma("ids", long.class);
         tbFeeDetailsService.jiChaConfirm(ids);
         return AjaxJson.getSuccess();
     }
+    /** 统计稽查员取消确认 */
     @RequestMapping("jiChaCancel")
     public AjaxJson jiChaCancel(){
         List<Long> ids = SoMap.getRequestSoMap().getListByComma("ids", long.class);
+        tbFeeDetailsService.jiChaCancel(ids);
         return AjaxJson.getSuccess();
     }
 

sp-server/src/main/java/com/pj/project/tb_fee_details/TbFeeDetailsService.java

@@ -494,7 +494,7 @@ public class TbFeeDetailsService extends ServiceImpl<TbFeeDetailsMapper, TbFeeDe
         }
         for (String day : days) {
             QueryWrapper<TbFeeDetails> ew1 = new QueryWrapper<>();
-            ew1.like("create_time", day).isNotNull(personColumn);
+            ew1.like("create_time", day).isNotNull(personColumn).ne(personColumn, "");
             List<TbFeeDetails> confirmList = this.list(ew1);
             QueryWrapper<TbFeeDetails> ew2 = new QueryWrapper<>();
             ew2.like("create_time", day);
@@ -529,4 +529,32 @@ public class TbFeeDetailsService extends ServiceImpl<TbFeeDetailsMapper, TbFeeDe
             }
         }
     }
+
+    public void jiChaCancel(List<Long> ids) {
+        SpAdmin admin = StpUserUtil.getAdmin();
+        SpRole role = spRoleMapper.getById(Long.valueOf(admin.getRoleId()));
+        if(!StrUtil.equals(TbFeeDetails.personEnum.JICHA.getDesc(), role.getName()) && !StrUtil.equals("admin", role.getType())){
+            throw new BusinessException("该操作需要统计稽查员的权限");
+        }
+        List<TbFeeDetails> detailsList = this.listByIds(ids);
+        Set<String> days = new HashSet<>();
+        for (TbFeeDetails detail : detailsList) {
+            detail.setJiChaPerson("").setKaiDanPerson("").setDiaoDuPerson("");
+            String dayStr = DateUtil.format(detail.getCreateTime(), "yyyy-MM-dd");
+            days.add(dayStr);
+        }
+        this.updateBatchById(detailsList);
+        changeStats(days);
+    }
+    private void changeStats(Set<String> days) {
+        for (String day : days) {
+            QueryWrapper<TbFeeStatistics> ew3= new QueryWrapper<>();
+            ew3.eq("day_time", day);
+            List<TbFeeStatistics> statsList = tbFeeStatisticsService.list(ew3);
+            for (TbFeeStatistics thisDayStats : statsList) {
+                thisDayStats.setJiChaPerson("").setKaiDanPerson("").setDiaoDuPerson("");
+            }
+            tbFeeStatisticsService.updateBatchById(statsList);
+        }
+    }
 }

sp-server/src/main/java/com/pj/project/tb_fee_statistics/TbFeeStatisticsService.java

@@ -263,7 +263,7 @@ public class TbFeeStatisticsService extends ServiceImpl<TbFeeStatisticsMapper, T
                 TbBusinessCar bt = tbBusinessCarService.getById(rela.getBusinessCarId());
                 if(StrUtil.contains(carNo, bt.getCarNo())){
                     businessCarIds += bt.getId() + ",";
-                    businessCarNos += bt.getCarNo() + ",";
+                    businessCarNos += bt.getNo() + ",";
                 }
             }
             businessCarIds = StrUtil.sub(businessCarIds, 0, businessCarIds.length()-1);