Merge branch 'dev' of liuwenbin/patient-co-management into dev

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/controller/synergy/customer/CustomerSynergyManageController.java

@@ -326,15 +326,19 @@ public class CustomerSynergyManageController extends BaseController {
    @RequestMapping(value = "/taskSubmit", method = RequestMethod.POST)
    @ApiOperation(value = "协同任务提交")
    @ResponseBody
    public String taskSubmit(@ApiParam(name="workorderCode",value="协同服务工单code",required = true)
    public String taskSubmit(@ApiParam(name="userCode",value="客服code",required = false)
                             @RequestParam(required = false)String userCode,
                             @ApiParam(name="workorderCode",value="协同服务工单code",required = true)
                             @RequestParam(required = true)String workorderCode,
                             @ApiParam(name="dealResultRemark",value="说明",required = false)
                             @RequestParam(required = false)String dealResultRemark,
                             @ApiParam(name="accessoryJson",value="附件的json",required = true)
                             @RequestParam(required = true)String accessoryJson){
        try{
            synergyManageService.taskSubmit(workorderCode,dealResultRemark,accessoryJson);
            if(!StringUtils.isNotEmpty(userCode)){
                userCode = getUID();
            }
            synergyManageService.taskSubmit(userCode,workorderCode,dealResultRemark,accessoryJson);
            return write(200,"提交成功");
        }catch (Exception e){
            error(e);

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/repository/synergy/ManageSynergyWorkorderServicerDao.java

@@ -31,4 +31,8 @@ public interface ManageSynergyWorkorderServicerDao extends PagingAndSortingRepos
    ManageSynergyWorkorderServicerDO findByCode(String code);
    List<ManageSynergyWorkorderServicerDO> findByWorkorderCode(String workorderCode);
    @Modifying
    @Query("update ManageSynergyWorkorderServicerDO s set s.executorCode = ?2,s.executorName=?3 where s.workorderCode = ?1 and s.executorCode is not null")
    Integer updateWorkorderServicer(String workorderCode,String userCode,String userName);
}

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/service/synergy/SynergyManageService.java

@@ -1154,7 +1154,7 @@ public class SynergyManageService extends BaseJpaService {
    @Transactional
    public void taskSubmit(String workorderCode,String dealResultRemark,String accessoryJson) throws Exception{
    public void taskSubmit(String userCode,String workorderCode,String dealResultRemark,String accessoryJson) throws Exception{
        JSONArray jsonArray = new JSONArray(accessoryJson);
        String fileName;
        String url;
@@ -1171,6 +1171,8 @@ public class SynergyManageService extends BaseJpaService {
            accessoryList.add(manageSynergyAccessoryDO);
        }
        manageSynergyAccessoryDao.save(accessoryList);
        User user = userDao.findByCode(userCode);
        workorderServicerDao.updateWorkorderServicer(workorderCode,userCode,user.getName());
        ManageSynergyWorkorderDO manageSynergyWorkorderDO = workOrderDao.findByCode(workorderCode);
        manageSynergyWorkorderDO.setDealResultRemark(dealResultRemark);
        manageSynergyWorkorderDO.setStatus(3);