flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java
@@ -114,12 +114,13 @@ entity.setCreateTime(LocalDateTime.now()); entity.setUpdateTime(LocalDateTime.now()); entity.setState("12"); entity.setDepartmentalId(sysUser.getDepartmentId()); entity.setToUserId(sysUser.getUserId()+""); entity.setFromUserId(order.getGuideUserId()); entity.setFromDepartmentalId(order.getGuideDepartmentId()); entity.setDepartmentalId(order.getGuideDepartmentId()); entity.setToUserId(order.getGuideUserId()); entity.setFromUserId(sysUser.getUserId()+""); entity.setFromDepartmentalId(sysUser.getDepartmentId()); iGuideEvolveService.insertConfig(entity); iGuideRepairOrderService.updateSysUserOrderNum(entity); return toAjax(iGuideRepairOrderService.updateConfig(order)); } @@ -168,8 +169,8 @@ //新增已办结记录 entity.setCreateTime(LocalDateTime.now()); entity.setUpdateTime(LocalDateTime.now()); entity.setFromDepartmentalId(sysUser.getDepartmentId()); entity.setFromUserId(sysUser.getUserId()+""); entity.setDepartmentalId(order.getGuideDepartmentId()); entity.setToUserId(order.getGuideUserId()); entity.setGuideId(order.getId().toString()); iGuideEvolveService.insertConfig(entity); return toAjax(iGuideRepairOrderService.updateConfig(order)); @@ -213,8 +214,8 @@ entity.setCreateTime(LocalDateTime.now()); entity.setUpdateTime(LocalDateTime.now()); entity.setState("5"); entity.setFromDepartmentalId(sysUser.getDepartmentId()); entity.setFromUserId(sysUser.getUserId()+""); entity.setDepartmentalId(sysUser.getDepartmentId()); entity.setToUserId(sysUser.getUserId()+""); iGuideEvolveService.insertConfig(entity); return toAjax(iGuideRepairOrderService.updateConfig(order)); } @@ -258,8 +259,8 @@ guideEvolveEntity.setCreateTime(LocalDateTime.now()); guideEvolveEntity.setUpdateTime(LocalDateTime.now()); guideEvolveEntity.setState("3"); guideEvolveEntity.setFromDepartmentalId(sysUser.getDepartmentId()); guideEvolveEntity.setFromUserId(sysUser.getUserId()+""); guideEvolveEntity.setDepartmentalId(sysUser.getDepartmentId()); guideEvolveEntity.setToUserId(sysUser.getUserId()+""); int i = iGuideRepairOrderService.updateConfig(entity); if (i>0) return toAjax( iGuideEvolveService.insertConfig(guideEvolveEntity)); flower_city/src/main/java/com/dg/core/db/gen/entity/ReplyTemplateEntity.java
@@ -13,6 +13,7 @@ import java.io.Serializable; import java.time.LocalDateTime; import java.util.List; @ApiModel("回复模板实体类") @Data @@ -132,5 +133,18 @@ @ApiModelProperty("附件id") private String accessoryId; /** * 附件列表 */ @TableField(exist = false) @ApiModelProperty("附件列表") private List<ElseAccessoryEntity> elseAccessoryEntityList; /** * 推荐办事指南列表 */ @TableField(exist = false) @ApiModelProperty("推荐办事指南列表") private List<TransactionEvent> transactionEventList; } flower_city/src/main/java/com/dg/core/service/IGuideRepairOrderService.java
@@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.dg.core.db.gen.entity.AutomessageCommonProblem; import com.dg.core.db.gen.entity.CountListNum; import com.dg.core.db.gen.entity.GuideEvolveEntity; import com.dg.core.db.gen.entity.GuideRepairOrder; import org.springframework.data.repository.query.Param; @@ -51,7 +52,12 @@ */ int countConfigList(String matterName,List<String> ids); /** * 根据进展类修改用户代办数量 * @param order * @return */ int updateSysUserOrderNum(GuideEvolveEntity order); /** * 统计工单用 1 今天 2昨天 3本月 4本年度 String time flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java
@@ -67,6 +67,8 @@ if (sysUsers!=null){//系统分配导办人员 SysUser sysUser = sysUsers.get(0);//因为sql用了升序排序所以第一条就是待办结最少的人员之一 guideRepairOrder.setState("2"); sysUser.setTransactionNum(sysUser.getTransactionNum()+1); sysUserMapper.updateById(sysUser); guideRepairOrder.setGuideUserId(sysUser.getUserId().toString()); guideRepairOrder.setGuideDepartmentId(sysUser.getDepartmentId()); //新增分配记录 @@ -162,6 +164,23 @@ return baseMapper.countConfigList(matterName,ids); } @Override public int updateSysUserOrderNum(GuideEvolveEntity order) { if(order.getState().equals("13")){ SysUser sysUser = sysUserMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getUserId, order.getToUserId())); sysUser.setTransactionNum(sysUser.getTransactionNum()+1); return sysUserMapper.updateById(sysUser); }else if(order.getState().equals("12")){ SysUser sysUserTo= sysUserMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getUserId, order.getToUserId())); SysUser sysUserFrom= sysUserMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getUserId, order.getFromUserId())); sysUserTo.setTransactionNum(sysUserTo.getTransactionNum()+1); sysUserFrom.setTransactionNum(sysUserFrom.getTransactionNum()-1); sysUserMapper.updateById(sysUserFrom); return sysUserMapper.updateById(sysUserTo); } return 0; } /** * 1 今天 2昨天 3本月 4本年度 String time * @param state flower_city/src/main/java/com/dg/core/service/impl/ReplyTemplateImpl.java
@@ -3,16 +3,26 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.dg.core.db.gen.entity.GuideEvolveEntity; import com.dg.core.db.gen.entity.ReplyTemplateEntity; import com.dg.core.db.gen.mapper.ElseAccessoryMapper; import com.dg.core.db.gen.mapper.ReplyTemplateMapper; import com.dg.core.db.gen.mapper.TransactionEventMapper; import com.dg.core.service.IReplyTemplateService; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.List; @Service public class ReplyTemplateImpl extends ServiceImpl<ReplyTemplateMapper, ReplyTemplateEntity> implements IReplyTemplateService { @Resource private ElseAccessoryMapper elseAccessoryMapper; @Resource private TransactionEventMapper transactionEventMapper; @Override public List<ReplyTemplateEntity> selectConfigList(IPage<ReplyTemplateEntity> page, @@ -22,7 +32,22 @@ @Override public ReplyTemplateEntity selectConfigData(String Id) { return baseMapper.selectConfigData(Id); ReplyTemplateEntity replyTemplateEntity = baseMapper.selectConfigData(Id); if (replyTemplateEntity!=null) { String[] split; if (replyTemplateEntity.getAccessoryId()!=null){ split = replyTemplateEntity.getAccessoryId().split(","); replyTemplateEntity.setElseAccessoryEntityList( elseAccessoryMapper.selectListByIds(split)); } if (replyTemplateEntity.getGuidance()!=null){ split=replyTemplateEntity.getGuidance().split(","); replyTemplateEntity.setTransactionEventList(transactionEventMapper.selectListByIds(split)); } return replyTemplateEntity; } else { return null; } } @Override
