server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwPatrolSchemeCloudController.java
@@ -101,4 +101,7 @@ public ApiResponse findById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) { return ApiResponse.success(ywPatrolSchemeService.findById(id)); } } server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwPatrolTaskRecordController.java
@@ -100,6 +100,13 @@ return ApiResponse.success(null); } @ApiOperation("扫码获取巡检点任务信息") @PostMapping("/getPointRecordByCode") @CloudRequiredPermission("business:ywpatroltaskrecord:update") public ApiResponse<YwPatrolTaskRecord> getPointRecordByCode(@RequestBody YwPatrolTaskRecord ywPatrolTaskRecord,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) { return ApiResponse.success("查询成功",ywPatrolTaskRecordService.getPointRecordByCode(ywPatrolTaskRecord)); } } server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwPatrolTaskRecord.java
@@ -109,6 +109,11 @@ @TableField(exist = false) private String content; @ApiModelProperty(value = "巡检点编码") @TableField(exist = false) private String pointCode; @ApiModelProperty(value = "附件列表") @TableField(exist = false) private List<Multifile> multifileList; server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwPatrolTaskRecordService.java
@@ -99,4 +99,6 @@ void patrolData(YwPatrolTaskRecord ywPatrolTaskRecord); YwPatrolTaskRecord getDetail(Integer id); YwPatrolTaskRecord getPointRecordByCode(YwPatrolTaskRecord bean); } server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -49,6 +49,7 @@ import com.doumee.service.business.impl.hksync.ferp.HkSyncOrgUserToHKServiceImpl; import com.doumee.service.system.SystemLoginService; import com.github.yulichang.wrapper.MPJLambdaWrapper; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.RandomStringUtils; import org.apache.commons.lang3.StringUtils; @@ -73,6 +74,7 @@ * @date 2023/11/30 15:33 */ @Service @Slf4j public class MemberServiceImpl implements MemberService { @Autowired @@ -1776,7 +1778,9 @@ String appSecret = systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_SECRET).getCode(); String getTokenUrl = WXConstant.GET_USER_INFO_URL.replace("CODE", code) .replace("APPID", appId).replace("SECRET", appSecret); log.error("=========================getTokenUrl=====================" + getTokenUrl); JSONObject tokenJson = JSONObject.parseObject(HttpsUtil.get(getTokenUrl,true)); log.error("=========================tokenJson=====================" + tokenJson); String openId = ""; WxAuthorizeVO wxAuthorizeVO = new WxAuthorizeVO(); if(Objects.nonNull(tokenJson)&&!Objects.isNull(tokenJson.get("access_token"))){ server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java
@@ -15,6 +15,8 @@ import com.doumee.dao.business.dao.SmsConfigMapper; import com.doumee.dao.business.dao.SmsEmailMapper; import com.doumee.dao.business.model.*; import com.doumee.dao.system.SystemUserMapper; import com.doumee.dao.system.model.SystemUser; import com.doumee.service.business.SmsEmailService; import com.doumee.service.business.third.EmayService; import org.apache.commons.lang3.StringUtils; @@ -44,6 +46,8 @@ private EmayService emayService; @Autowired private SmsConfigMapper smsConfigMapper; @Autowired private SystemUserMapper systemUserMapper; @Value("${debug_model}") private boolean debugModel; @@ -86,6 +90,10 @@ if(StringUtils.isBlank(smsEmail.getPhone())){ throw new BusinessException(ResponseStatus.BAD_REQUEST); } //根据手机号查询用户 if(systemUserMapper.selectCount(new QueryWrapper<SystemUser>().lambda().eq(SystemUser::getMobile,smsEmail.getPhone()))==Constants.ZERO){ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"对不起，手机号无效请检查后重试!"); }; String nowDate = DateUtil.getFomartDate(new Date(),"yyyy-MM-dd HH:mm:ss"); if(smsEmailMapper.selectCount(new QueryWrapper<SmsEmail>().lambda() .eq(SmsEmail::getPhone,smsEmail.getPhone()) server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractBillServiceImpl.java
@@ -434,7 +434,7 @@ for (String codeDate:codeDateSet) { //获取当前日期的数据 List<YwContractBill> codeDateBillList = ywContractBillList.stream().filter(i->i.getCodeDate().equals(codeDate)).collect(Collectors.toList()); ywContractBillList.stream().filter(i->StringUtils.isNotBlank(i.getCodeDate()) && i.getCodeDate().equals(codeDate)).collect(Collectors.toList()); if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isEmpty(codeDateBillList)){ continue; } server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java
@@ -89,7 +89,6 @@ }else{ model.setStatus(Constants.TWO); } model.setStatus(Constants.ZERO);//待执行 model.setRemark(getRemarlByParam(model)); ywContractMapper.insert(model); dealDetailListBiz(model);//处理条款信息 @@ -707,7 +706,7 @@ } } for(int i=0;i<billList2.size();i++){ if(Constants.equalsInteger(billList1.get(i).getCostType(),Constants.ONE)) { if(Constants.equalsInteger(billList2.get(i).getCostType(),Constants.ONE)) { billList2.get(i).setSortnum(num); num++; } server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolSchemeServiceImpl.java
@@ -61,12 +61,16 @@ ||Objects.isNull(ywPatrolScheme.getStartDate()) ||Objects.isNull(ywPatrolScheme.getEndDate()) ||Objects.isNull(ywPatrolScheme.getCircleType()) ||StringUtils.isBlank(ywPatrolScheme.getStartTime()) ||StringUtils.isBlank(ywPatrolScheme.getEndTime()) || (!Constants.equalsInteger(ywPatrolScheme.getCircleType(),Constants.ZERO) &&StringUtils.isBlank(ywPatrolScheme.getCircleDays())) ){ throw new BusinessException(ResponseStatus.BAD_REQUEST); } if(StringUtils.isBlank(ywPatrolScheme.getStartTime())){ ywPatrolScheme.setStartTime("00:00:00"); } if(StringUtils.isBlank(ywPatrolScheme.getEndTime())){ ywPatrolScheme.setEndTime("23:59:59"); } LoginUserInfo loginUserInfo = ywPatrolScheme.getLoginUserInfo(); ywPatrolScheme.setCreateDate(new Date()); ywPatrolScheme.setCreator(loginUserInfo.getId()); server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolTaskRecordServiceImpl.java
@@ -221,6 +221,58 @@ @Override @Transactional(rollbackFor = {Exception.class,BusinessException.class}) public YwPatrolTaskRecord getPointRecordByCode(YwPatrolTaskRecord bean) { if(Objects.isNull(bean) || Objects.isNull(bean.getTaskId()) || StringUtils.isBlank(bean.getPointCode())){ throw new BusinessException(ResponseStatus.BAD_REQUEST); } YwPatrolTaskRecord ywPatrolTaskRecord = ywPatrolTaskRecordMapper.selectJoinOne(YwPatrolTaskRecord.class,new MPJLambdaWrapper<YwPatrolTaskRecord>() .selectAll(YwPatrolTaskRecord.class) .selectAs(YwPatrolPoint::getName,YwPatrolTaskRecord::getPointName) .selectAs(YwPatrolPoint::getContent,YwPatrolTaskRecord::getContent) .selectAs(SystemUser::getRealname,YwPatrolTaskRecord::getRealname) .selectAs(Company::getName,YwPatrolTaskRecord::getCompanyName) .leftJoin(YwPatrolPoint.class,YwPatrolPoint::getId,YwPatrolTaskRecord::getPointId) .leftJoin(SystemUser.class,SystemUser::getId,YwPatrolTaskRecord::getDealUserId) .leftJoin(Company.class,Company::getId,SystemUser::getCompanyId) .eq(YwPatrolScheme::getIsdeleted, Constants.ZERO) .eq(YwPatrolPoint::getCode,bean.getPointCode()) .eq(YwPatrolTaskRecord::getTaskId,bean.getTaskId()) .orderByDesc(YwPatrolScheme::getCreateDate) .last(" limit 1 ") ); if(Objects.isNull(ywPatrolTaskRecord)){ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未匹配到巡检点!"); } //附件数据 List<Multifile> multifileList = multifileMapper.selectJoinList(Multifile.class,new MPJLambdaWrapper<Multifile>() .selectAll(Multifile.class) .selectAs(SystemUser::getRealname,Multifile::getUserName) .leftJoin(SystemUser.class,SystemUser::getId,Multifile::getCreator) .eq(Multifile::getObjId,ywPatrolTaskRecord.getId()) .eq(Multifile::getIsdeleted,Constants.ZERO) .eq(Multifile::getObjType,Constants.MultiFile.FN_PATROL_TASK_RECORD_FILE.getKey())); if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(multifileList)){ String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode() +systemDictDataBiz.queryByCode(Constants.FTP,Constants.YW_PATROL).getCode(); for (Multifile multifile:multifileList) { if(StringUtils.isNotBlank(multifile.getFileurl())){ multifile.setFileurlFull(path + multifile.getFileurl()); } } ywPatrolTaskRecord.setMultifileList(multifileList); } return ywPatrolTaskRecord; } @Override public YwPatrolTaskRecord getDetail(Integer id) { YwPatrolTaskRecord ywPatrolTaskRecord = ywPatrolTaskRecordMapper.selectJoinOne(YwPatrolTaskRecord.class,new MPJLambdaWrapper<YwPatrolTaskRecord>() server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolTaskServiceImpl.java
@@ -146,7 +146,7 @@ .leftJoin(YwPatrolScheme.class,YwPatrolScheme::getId,YwPatrolTask::getSchemeId) .eq(YwPatrolTask::getIsdeleted, Constants.ZERO) .eq(Objects.nonNull(model.getStatus()) && !Constants.equalsInteger(model.getStatus(),Constants.TWO),YwPatrolTask::getStatus, model.getStatus()) .eq(Objects.nonNull(model.getDealUserId()),YwPatrolTask::getDealUserId, model.getDealUserId()) .eq(Objects.nonNull(model.getDealUserId()),YwPatrolScheme::getUserIds, model.getDealUserId()) .apply(Objects.nonNull(model.getStatus()) && Constants.equalsInteger(model.getStatus(),Constants.TWO)," t.status = 1 and t.END_DATE > now() ") .apply(StringUtils.isNotBlank(model.getQueryStatus())," find_in_set(t.status ,'"+model.getQueryStatus()+"') ") .like(StringUtils.isNotBlank(model.getPlanTitle()),YwPatrolScheme::getTitle,model.getPlanTitle())
