|
|
@@ -158,7 +158,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
|
|
|
for (SysAccountMultilevel sysAccountMultilevel : safe) {
|
|
|
phoneList.add(sysAccountMultilevel.getPhone());
|
|
|
}
|
|
|
- SendSMS.sendSMS(phoneList,TokenSign.getUserNameByJwtToken(httpServletRequest)+"入场申请测试");
|
|
|
+// SendSMS.sendSMS(phoneList,TokenSign.getUserNameByJwtToken(httpServletRequest)+"入场申请测试");
|
|
|
if (ObjectUtil.isNotEmpty(goods)){
|
|
|
ObjectMapper objectMapper = new ObjectMapper();
|
|
|
List<BillGoodsInventory> admissionAndGoods = objectMapper.readValue(goods, new TypeReference<List<BillGoodsInventory>>() {});
|
|
|
@@ -252,7 +252,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
|
|
|
billPersonnelAdmission.setBillStatus(2);
|
|
|
baseProcess.setProcessType(2);
|
|
|
baseProcess.setCurrentStatus(String.join(",",split));
|
|
|
- SendSMS.sendSMS(phoneList,"拒绝入场申请测试");
|
|
|
+// SendSMS.sendSMS(phoneList,"拒绝入场申请测试");
|
|
|
} else {
|
|
|
//通过
|
|
|
billPersonnelAdmission.setBillStatus(1);
|
|
|
@@ -261,7 +261,8 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
|
|
|
String[] strings = locationId.split(",");
|
|
|
String laseLocationId = strings[strings.length-1];
|
|
|
BaseLocation baseLocation;
|
|
|
- if (!"9".equals(billPersonnelAdmission.getDestId())){
|
|
|
+ System.out.println(billPersonnelAdmission.getDestId());
|
|
|
+ if (!(billPersonnelAdmission.getDestId() == 9)){
|
|
|
baseLocation = baseLocationMapper.selectById(laseLocationId);
|
|
|
}else {
|
|
|
baseLocation = baseLocationMapper.selectById(billPersonnelAdmission.getDestId());
|
|
|
@@ -295,7 +296,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
|
|
|
billPcr.setTestLocation(baseLocation.getLocationName());
|
|
|
billPcr.setTestLocationId(baseLocation.getId());
|
|
|
billPcrMapper.insert(billPcr);
|
|
|
- SendSMS.sendSMS(phoneList,"通过入场申请测试");
|
|
|
+// SendSMS.sendSMS(phoneList,"通过入场申请测试");
|
|
|
} else {
|
|
|
baseProcess.setCurrentStatus("1");
|
|
|
// baseProcess.setCurrentLocation(baseProcess.getCurrentLocation()+","+baseLocation.getLocationName());
|
