Merge branch 'online1' of http://git.dayaedu.com/yonge/mec into hr_728

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/entity/SysUser.java

@@ -135,11 +135,14 @@ public class SysUser implements Serializable{
 
 	private String certificateType;
 
-	@ApiModelProperty(value = "部门id",required = false)
-	private Integer deptId;
+	@ApiModelProperty(value = "部门ids",required = false)
+	private String deptIds;
 
 	@ApiModelProperty(value = "岗位id",required = false)
-	private Integer postId;
+	private String postIds;
+
+	@ApiModelProperty(value = "岗位管理部门",required = false)
+	private String postDeptIds;
 
 	@ApiModelProperty(value = "银行卡号",required = false)
 	private String bankCard;
@@ -434,20 +437,20 @@ public class SysUser implements Serializable{
 		this.currentGradeNum = currentGradeNum;
 	}
 
-	public Integer getDeptId() {
-		return deptId;
+	public String getDeptIds() {
+		return deptIds;
 	}
 
-	public void setDeptId(Integer deptId) {
-		this.deptId = deptId;
+	public void setDeptIds(String deptId) {
+		this.deptIds = deptId;
 	}
 
-	public Integer getPostId() {
-		return postId;
+	public String getPostIds() {
+		return postIds;
 	}
 
-	public void setPostId(Integer postId) {
-		this.postId = postId;
+	public void setPostIds(String postIds) {
+		this.postIds = postIds;
 	}
 
 	public String getBankCard() {
@@ -465,4 +468,12 @@ public class SysUser implements Serializable{
 	public void setOpenBankAddress(String openBankAddress) {
 		this.openBankAddress = openBankAddress;
 	}
+
+	public String getPostDeptIds() {
+		return postDeptIds;
+	}
+
+	public void setPostDeptIds(String postDeptIds) {
+		this.postDeptIds = postDeptIds;
+	}
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/EmployeeDao.java

@@ -194,4 +194,11 @@ public interface EmployeeDao extends BaseDAO<Integer, Employee> {
      * @return
      */
     List<String> queryVipGroupIdByUserId(Integer levelUserId);
+
+    /**
+     * 获取用户信息
+     * @param userIds
+     * @return
+     */
+    List<SysUser> getUsers(@Param("userIds") List<Integer> userIds);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/CirculationUser.java

@@ -0,0 +1,84 @@
+package com.ym.mec.biz.dal.dto;
+
+import com.ym.mec.biz.dal.entity.SysUserTsign;
+import io.swagger.annotations.ApiModelProperty;
+
+public class CirculationUser {
+
+    @ApiModelProperty(value = "OA审批id", required = false)
+    private Integer workOrder;
+
+    @ApiModelProperty(value = "审批节点", required = false)
+    private String state;
+
+    @ApiModelProperty(value = "审批意见", required = false)
+    private String remarks;
+
+    @ApiModelProperty(value = "审批用户id", required = false)
+    private Integer userId;
+
+    @ApiModelProperty(value = "审批用户姓名", required = false)
+    private String realName;
+
+    @ApiModelProperty(value = "审批用户身份证号", required = false)
+    private String idCard;
+
+    @ApiModelProperty(value = "审批用户手机号", required = false)
+    private String phone;
+
+    public Integer getWorkOrder() {
+        return workOrder;
+    }
+
+    public void setWorkOrder(Integer workOrder) {
+        this.workOrder = workOrder;
+    }
+
+    public String getState() {
+        return state;
+    }
+
+    public void setState(String state) {
+        this.state = state;
+    }
+
+    public String getRemarks() {
+        return remarks;
+    }
+
+    public void setRemarks(String remarks) {
+        this.remarks = remarks;
+    }
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    public String getRealName() {
+        return realName;
+    }
+
+    public void setRealName(String realName) {
+        this.realName = realName;
+    }
+
+    public String getIdCard() {
+        return idCard;
+    }
+
+    public void setIdCard(String idCard) {
+        this.idCard = idCard;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/EmployeeDto.java

@@ -60,6 +60,15 @@ public class EmployeeDto {
 
     private String postalCode;
 
+    @ApiModelProperty(value = "OA部门ids",required = false)
+    private String deptIds;
+
+    @ApiModelProperty(value = "OA岗位ids",required = false)
+    private String postIds;
+
+    @ApiModelProperty(value = "岗位管理范围",required = false)
+    private String postDeptIds;
+
     public String getOrganIdStr() {
         return organIdStr;
     }
@@ -187,4 +196,28 @@ public class EmployeeDto {
     public void setDemissionDate(Date demissionDate) {
         this.demissionDate = demissionDate;
     }
+
+    public String getDeptIds() {
+        return deptIds;
+    }
+
+    public void setDeptIds(String deptIds) {
+        this.deptIds = deptIds;
+    }
+
+    public String getPostIds() {
+        return postIds;
+    }
+
+    public void setPostIds(String postIds) {
+        this.postIds = postIds;
+    }
+
+    public String getPostDeptIds() {
+        return postDeptIds;
+    }
+
+    public void setPostDeptIds(String postDeptIds) {
+        this.postDeptIds = postDeptIds;
+    }
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/OAFinancialDto.java

@@ -0,0 +1,109 @@
+package com.ym.mec.biz.dal.dto;
+
+import com.ym.mec.biz.dal.entity.SysUserTsign;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+public class OAFinancialDto {
+
+    @ApiModelProperty(value = "公司名称", required = false)
+    private String organName;
+
+    @ApiModelProperty(value = "费用申请人", required = false)
+    private String realName;
+
+    @ApiModelProperty(value = "费用类型", required = false)
+    private String feeType;
+
+    @ApiModelProperty(value = "报销金额", required = false)
+    private BigDecimal totalMoney;
+
+    @ApiModelProperty(value = "是否有借款 （是 否）", required = false)
+    private String hasLoan;
+
+    @ApiModelProperty(value = "情况说明", required = false)
+    private String memo;
+
+    @ApiModelProperty(value = "审批人数据", required = false)
+    private List<CirculationUser> circulationUsers;
+
+    @ApiModelProperty(value = "执行人数据", required = false)
+    private List<CirculationUser> executors;
+
+    @ApiModelProperty(value = "签章数据", required = false)
+    private List<SysUserTsign> sysUserTsigns;
+
+    public String getOrganName() {
+        return organName;
+    }
+
+    public void setOrganName(String organName) {
+        this.organName = organName;
+    }
+
+    public String getRealName() {
+        return realName;
+    }
+
+    public void setRealName(String realName) {
+        this.realName = realName;
+    }
+
+    public String getFeeType() {
+        return feeType;
+    }
+
+    public void setFeeType(String feeType) {
+        this.feeType = feeType;
+    }
+
+    public BigDecimal getTotalMoney() {
+        return totalMoney;
+    }
+
+    public void setTotalMoney(BigDecimal totalMoney) {
+        this.totalMoney = totalMoney;
+    }
+
+    public String getHasLoan() {
+        return hasLoan;
+    }
+
+    public void setHasLoan(String hasLoan) {
+        this.hasLoan = hasLoan;
+    }
+
+    public String getMemo() {
+        return memo;
+    }
+
+    public void setMemo(String memo) {
+        this.memo = memo;
+    }
+
+    public List<CirculationUser> getCirculationUsers() {
+        return circulationUsers;
+    }
+
+    public void setCirculationUsers(List<CirculationUser> circulationUsers) {
+        this.circulationUsers = circulationUsers;
+    }
+
+    public List<CirculationUser> getExecutors() {
+        return executors;
+    }
+
+    public void setExecutors(List<CirculationUser> executors) {
+        this.executors = executors;
+    }
+
+    public List<SysUserTsign> getSysUserTsigns() {
+        return sysUserTsigns;
+    }
+
+    public void setSysUserTsigns(List<SysUserTsign> sysUserTsigns) {
+        this.sysUserTsigns = sysUserTsigns;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/Employee.java

@@ -54,11 +54,11 @@ public class Employee extends SysUser {
 	@ApiModelProperty(value = "证件号码",required = false)
 	private String certificateNum;
 
-	@ApiModelProperty(value = "部门id",required = false)
-	private Integer depId;
+	@ApiModelProperty(value = "部门ids",required = false)
+	private String depIds;
 
-	@ApiModelProperty(value = "岗位id",required = false)
-	private Integer postId;
+	@ApiModelProperty(value = "岗位ids",required = false)
+	private String postIds;
 
 	@ApiModelProperty(value = "银行卡号",required = false)
 	private String bankCard;
@@ -66,6 +66,9 @@ public class Employee extends SysUser {
 	@ApiModelProperty(value = "开户行",required = false)
 	private String openBankAddress;
 
+	@ApiModelProperty(value = "岗位管理部门",required = false)
+	private String postDeptIds;
+
 	/**  */
 	private java.util.Date updateTime;
 
@@ -228,20 +231,20 @@ public class Employee extends SysUser {
 		return ToStringBuilder.reflectionToString(this);
 	}
 
-	public Integer getDeptId() {
-		return depId;
+	public String getDeptIds() {
+		return depIds;
 	}
 
-	public void setDeptId(Integer deptId) {
-		this.depId = deptId;
+	public void setDeptIds(String deptIds) {
+		this.depIds = deptIds;
 	}
 
-	public Integer getPostId() {
-		return postId;
+	public String getPostIds() {
+		return postIds;
 	}
 
-	public void setPostId(Integer postId) {
-		this.postId = postId;
+	public void setPostIds(String postIds) {
+		this.postIds = postIds;
 	}
 
 	public String getBankCard() {
@@ -259,4 +262,12 @@ public class Employee extends SysUser {
 	public void setOpenBankAddress(String openBankAddress) {
 		this.openBankAddress = openBankAddress;
 	}
+
+	public String getPostDeptIds() {
+		return postDeptIds;
+	}
+
+	public void setPostDeptIds(String postDeptIds) {
+		this.postDeptIds = postDeptIds;
+	}
 }

mec-biz/src/main/java/com/ym/mec/biz/service/ContractService.java

@@ -2,8 +2,11 @@ package com.ym.mec.biz.service;
 
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 
+import com.ym.mec.biz.dal.dto.CirculationUser;
+import com.ym.mec.biz.dal.dto.OAFinancialDto;
 import com.ym.mec.biz.dal.entity.SysUserTsign;
 import com.ym.mec.biz.dal.enums.KitGroupPurchaseTypeEnum;
 import com.ym.mec.common.entity.HttpResponseResult;
@@ -128,4 +131,13 @@ public interface ContractService {
 	 * @return
 	 */
 	Map<String, Object> queryProductContract(Integer userId,String musicGroupId);
+
+
+	/**
+	 * OA财务审批的签章
+	 * @param financialDto
+	 * @return
+	 */
+	String transferOaFinancial(OAFinancialDto financialDto);
+
 }

mec-biz/src/main/java/com/ym/mec/biz/service/EmployeeService.java

@@ -7,6 +7,7 @@ import com.ym.mec.biz.dal.enums.EmployeeOperateEnum;
 import com.ym.mec.biz.dal.page.EmployeeQueryInfo;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.BaseService;
+import com.ym.mec.oa.entity.OAUser;
 
 import java.util.HashMap;
 import java.util.List;

mec-biz/src/main/java/com/ym/mec/biz/service/OaUserService.java

@@ -0,0 +1,37 @@
+package com.ym.mec.biz.service;
+
+import com.ym.mec.biz.dal.entity.Employee;
+
+public interface OaUserService {
+
+    /**
+     * 添加OA用户
+     * @param employee
+     * @return
+     */
+    Object addOaUser(Employee employee);
+
+
+    /**
+     * 修改OA用户
+     * @param employee
+     * @return
+     */
+    Object updateOaUser(Employee employee);
+
+
+    /**
+     * 删除OA用户（软删除）
+     * @param employee
+     * @return
+     */
+    Object delOaUser(Employee employee);
+
+
+    /**
+     * 恢复OA用户
+     * @param employee
+     * @return
+     */
+    Object reInsertOaUser(Employee employee);
+}

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ContractServiceImpl.java

@@ -3,16 +3,17 @@ package com.ym.mec.biz.service.impl;
 import java.io.File;
 import java.io.IOException;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.Map.Entry;
-import java.util.Objects;
+import java.util.stream.Collectors;
 
+import com.ym.mec.biz.dal.dao.*;
+import com.ym.mec.biz.dal.dto.CirculationUser;
+import com.ym.mec.biz.dal.dto.OAFinancialDto;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -31,12 +32,6 @@ import org.springframework.util.CollectionUtils;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.auth.api.enums.CertificateTypeEnum;
-import com.ym.mec.biz.dal.dao.MusicGroupPaymentCalenderDao;
-import com.ym.mec.biz.dal.dao.MusicGroupStudentFeeDao;
-import com.ym.mec.biz.dal.dao.StudentDao;
-import com.ym.mec.biz.dal.dao.StudentPaymentOrderDetailDao;
-import com.ym.mec.biz.dal.dao.StudentRegistrationDao;
-import com.ym.mec.biz.dal.dao.SysUserContractsDao;
 import com.ym.mec.biz.dal.dto.StudentInfo;
 import com.ym.mec.biz.dal.entity.CooperationOrgan.OwnershipType;
 import com.ym.mec.biz.dal.entity.Goods;
@@ -142,6 +137,9 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 	@Autowired
 	private StudentDao studentDao;
 
+	@Autowired
+	private EmployeeDao employeeDao;
+
 	@Value("${contract.baseDir:/var/pdf}")
 	private String contractBaseDir;
 
@@ -498,7 +496,7 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 		} else {
 			params.put("paymentcalender", calenders.stream().map(cal -> cal.getPaymentMonth().toString()).collect(Collectors.joining("月,")) + "月");
 		}*/
-		
+
 		params.put("paymentcalender", "一次性");
 
 		params.put("isShowVisualSeal", true);
@@ -1250,4 +1248,87 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 		FileUtils.deleteQuietly(srcFile);
 		return BaseController.succeed();
 	}
+
+	@Override
+	public String transferOaFinancial(OAFinancialDto financialDto) {
+		List<Integer> circulationUserIds = financialDto.getCirculationUsers().stream().map(CirculationUser::getUserId).collect(Collectors.toList());
+		List<Integer> executorIds = financialDto.getExecutors().stream().map(CirculationUser::getUserId).collect(Collectors.toList());
+		circulationUserIds.addAll(executorIds);
+		List<SysUser> users = employeeDao.getUsers(circulationUserIds);
+
+		Integer workOrderId = null;
+		List<SysUserTsign> sysUserTsigns = new ArrayList<>();
+		for (SysUser user : users) {
+			for (CirculationUser circulationUser : financialDto.getCirculationUsers()) {
+				if (workOrderId == null) {
+					workOrderId = circulationUser.getWorkOrder();
+				}
+				if (!circulationUser.getUserId().equals(user.getId())) continue;
+				circulationUser.setRealName(user.getRealName());
+			}
+			for (CirculationUser executor : financialDto.getExecutors()) {
+				if (!executor.getUserId().equals(user.getId())) continue;
+				executor.setRealName(user.getRealName());
+			}
+			SysUserTsign sysUserTsign = sysUserTsignService.get(user.getId());
+			if (sysUserTsign == null) {
+				try {
+					sysUserTsign = register(user.getId(), user.getRealName(), user.getIdCardNo(), user.getPhone());
+				} catch (Exception e) {
+					logger.error("用户电子签章注册失败", e);
+					continue;
+				}
+			}
+			sysUserTsigns.add(sysUserTsign);
+		}
+
+		Date date = new Date();
+
+		// 合成freemarker
+		String srcPdfPath = contractBaseDir + "/oa/" + dateFormat1.format(date) + "/" + workOrderId + "_" + LocalDateTime.now().getSecond() + ".pdf";
+
+		File srcFile = new File(srcPdfPath);
+
+		File debtFile = new File(srcFile.getParent());
+		if (!debtFile.exists()) {
+			debtFile.mkdirs();
+		}
+
+		FreemarkerTemplateEngine templateEngine = FreemarkerTemplateEngine.getInstance();
+		templateEngine.setClassForTemplateLoading(ContractServiceImpl.class, "/config/contracts/");
+
+		Map<String, Object> params = new HashMap<String, Object>();
+
+		// 查询参数信息
+		params.put("organName", financialDto.getOrganName());
+		params.put("realName", financialDto.getRealName());
+		params.put("feeType", financialDto.getFeeType());
+		params.put("totalMoney", financialDto.getTotalMoney().setScale(2, RoundingMode.HALF_UP));
+		params.put("hasLoan", financialDto.getHasLoan());
+		params.put("memo", financialDto.getMemo());
+		params.put("circulationUsers", financialDto.getCirculationUsers());
+		params.put("executors", financialDto.getExecutors());
+
+		templateEngine.render(params, "financial.ftl", srcFile);
+
+		// 生成借款协议PDF
+		try {
+			PDFUtil.renderToPDFByData(ContractServiceImpl.class.getResource("/").getFile(), FileUtils.readFileToString(srcFile), srcPdfPath, "simsun.ttc");
+		} catch (IOException e) {
+			logger.error("生成签章协议失败", e);
+		}
+
+		for (SysUserTsign sysUserTsign : sysUserTsigns) {
+			eSealPlugin.userSign(sysUserTsign.getAccountId(), sysUserTsign.getSealData(), sysUserTsign.getUserId().toString(), srcPdfPath, srcPdfPath);
+		}
+
+		//上传到oss
+		String dateStrOss = dateFormatOss.format(date);
+		dateStrOss = "oa/" + dateStrOss + "/" + DateUtil.getHour(date);
+		String pdfFilePath = storagePluginContext.uploadFile(KS3StoragePlugin.PLUGIN_NAME, dateStrOss, srcFile);
+
+		FileUtils.deleteQuietly(srcFile);
+
+		return pdfFilePath;
+	}
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/EmployeeServiceImpl.java

@@ -4,13 +4,14 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.entity.Organization;
 import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.biz.service.ImUserFriendService;
+import com.ym.mec.biz.service.OaUserService;
 import com.ym.mec.im.entity.GroupMember;
 import com.ym.mec.im.entity.GroupModel;
+import com.ym.mec.oa.entity.OAUser;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
@@ -31,7 +32,6 @@ import com.ym.mec.biz.dal.page.EmployeeQueryInfo;
 import com.ym.mec.biz.service.EmployeeService;
 import com.ym.mec.biz.service.ImGroupMemberService;
 import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.common.entity.ImGroupMember;
 import com.ym.mec.common.entity.ImGroupModel;
 import com.ym.mec.common.entity.ImResult;
 import com.ym.mec.common.entity.ImUserModel;
@@ -67,6 +67,8 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 	private ImGroupDao imGroupDao;
 	@Autowired
 	private CooperationOrganDao cooperationOrganDao;
+	@Autowired
+	private OaUserService oaUserService;
 
 	@Override
 	public BaseDAO<Integer, Employee> getDAO() {
@@ -107,6 +109,12 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 		ImResult imResult = imFeignService.register(new ImUserModel(employee.getId().toString(), employee.getUsername(),null));
 		employee.setImToken(imResult.getToken());
 		teacherDao.updateUser(employee);
+		if(user != null){
+			employee.setAvatar(user.getAvatar());
+		}
+
+		//添加到OA
+		oaUserService.addOaUser(employee);
 	}
 
 	@Override
@@ -135,6 +143,11 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 		imGroupDao.updateNickname(employee.getUserId(), employee.getRealName());
 		imGroupDao.updateUserFriendNickname(employee.getUserId(), employee.getRealName());
 		imFeignService.update(new ImUserModel(employee.getUserId().toString(),employee.getRealName(),sysUser.getAvatar()));
+
+		employee.setAvatar(sysUser.getAvatar());
+
+		//更新OA信息
+		oaUserService.updateOaUser(employee);
 	}
 
 	@Override
@@ -213,10 +226,16 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 				employeeDao.updateUserLock(employeeId,1);
 				employeeDao.updateUserDemissionDate(employeeId);
 				sysUserFeignService.exitByPhone("system", sysUser.getPhone());
+
+				//更新OA信息
+				oaUserService.delOaUser(employee);
 				break;
 			case REINSTATE:
 				//离职，如果有关联课程组教务老师，
 				employeeDao.updateUserDemissionDate(employeeId);
+
+				//更新OA信息
+				oaUserService.reInsertOaUser(employee);
 				break;
 		}
 	}

mec-biz/src/main/java/com/ym/mec/biz/service/impl/OaServiceImpl.java

@@ -0,0 +1,75 @@
+package com.ym.mec.biz.service.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.ym.mec.biz.dal.entity.Employee;
+import com.ym.mec.biz.service.OaUserService;
+import com.ym.mec.oa.OaFeignService;
+import com.ym.mec.oa.entity.OAUser;
+import com.ym.mec.oa.entity.PostDept;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+
+@Service
+public class OaServiceImpl implements OaUserService {
+    @Autowired
+    private OaFeignService oaFeignService;
+
+    @Override
+    @Async
+    public Object addOaUser(Employee employee) {
+        OAUser oaUser = new OAUser();
+        oaUser.setMecUserId(employee.getUserId());
+        oaUser.setUserName(employee.getRealName());
+        oaUser.setNickName(employee.getRealName());
+        oaUser.setPhone(employee.getPhone());
+        oaUser.setSex(employee.getGender().toString());
+        oaUser.setDeptIds(JSON.parseArray(employee.getDeptIds(), Integer.class));
+        oaUser.setAvatar(employee.getAvatar());
+        oaUser.setPostDeptIds(JSON.parseArray(employee.getPostDeptIds(), PostDept.class));
+        if (oaUser.getPostDeptIds() != null) {
+            List<Integer> postIds = oaUser.getPostDeptIds().stream().map(PostDept::getPostId).collect(Collectors.toList());
+            oaUser.setPostIds(postIds);
+        }
+        return oaFeignService.register(oaUser);
+    }
+
+    @Override
+    @Async
+    public Object updateOaUser(Employee employee) {
+        OAUser oaUser = new OAUser();
+        oaUser.setMecUserId(employee.getUserId());
+        oaUser.setUserName(employee.getRealName());
+        oaUser.setNickName(employee.getRealName());
+        oaUser.setPhone(employee.getPhone());
+        oaUser.setSex(employee.getGender().toString());
+        oaUser.setDeptIds(JSON.parseArray(employee.getDeptIds(), Integer.class));
+        oaUser.setAvatar(employee.getAvatar());
+        oaUser.setPostDeptIds(JSON.parseArray(employee.getPostDeptIds(), PostDept.class));
+        if (oaUser.getPostDeptIds() != null) {
+            List<Integer> postIds = oaUser.getPostDeptIds().stream().map(PostDept::getPostId).collect(Collectors.toList());
+            oaUser.setPostIds(postIds);
+        }
+        return oaFeignService.updateUser(oaUser);
+    }
+
+    @Override
+    @Async
+    public Object delOaUser(Employee employee) {
+        OAUser oaUser = new OAUser();
+        oaUser.setMecUserId(employee.getUserId());
+        return oaFeignService.delUser(oaUser);
+    }
+
+    @Override
+    @Async
+    public Object reInsertOaUser(Employee employee) {
+        OAUser oaUser = new OAUser();
+        oaUser.setMecUserId(employee.getUserId());
+        return oaFeignService.reInsertUser(oaUser);
+    }
+}

mec-biz/src/main/resources/config/contracts/financial.ftl

@@ -0,0 +1,108 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8"/>
+    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
+    <meta name="viewport"
+          content="width=device-width,initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no, viewport-fit=cover"/>
+    <meta http-equiv="Pragma" content="no-cache"/>
+    <meta http-equiv="Cache-Control" content="no-cache"/>
+    <meta http-equiv="Expires" content="0"/>
+    <title>费用报销单</title>
+    <style>
+        body {
+            margin: 0;
+        }
+
+        .container {
+            padding: 22px 20px 3px;
+            font-size: 14px;
+            max-width: 600px;
+            margin: 0 auto;
+        }
+
+        h1 {
+            font-size: 18px;
+            text-align: center;
+            margin-bottom: 8px;
+        }
+
+        table {
+            width: 100%;
+            border-collapse: collapse;
+        }
+
+        table, tr, td {
+            border: 1px solid #424242;
+        }
+
+        .title {
+            width: 110px;
+            text-align: center;
+        }
+
+        td {
+            padding: 10px 5px;
+        }
+    </style>
+</head>
+<body style="font-family:'SimSun'">
+<div class="container">
+    <h1>${organName!}费用报销单</h1>
+    <table class="table">
+        <tr>
+            <td class="title">公司名称:</td>
+            <td class="concat">${organName!}</td>
+        </tr>
+        <tr>
+            <td class="title">费用申请人:</td>
+            <td class="concat">${realName!}</td>
+        </tr>
+        <tr>
+            <td class="title">费用类型:</td>
+            <td class="concat">${feeType!}</td>
+        </tr>
+        <tr>
+            <td class="title">报销金额:</td>
+            <td class="concat">${totalMoney?string(',###.00')}</td>
+        </tr>
+        <tr>
+            <td class="title">是否有借款:</td>
+            <td class="concat">${hasLoan!}</td>
+        </tr>
+
+        <tr>
+            <td class="title">情况说明:</td>
+            <td class="concat">
+                ${memo!}
+            </td>
+        </tr>
+    </table>
+    <table style="border-top: 0;">
+        <#list circulationUsers as circulationUser>
+            <#if circulationUser_index=0>
+                <tr style="border-top: 0;">
+                    <td style="border-top: 0;" rowspan="${circulationUsers?size}" class="title">审批意见:</td>
+                    <td class="title" style="width: 110px;border-top: 0;">${circulationUser.state!}:</td>
+                    <td style="border-top: 0;" class="concat">${circulationUser.remarks!}<span style="color: #ffffff;">${circulationUser.userId?c}</span></td>
+                </tr>
+            <#else>
+                <tr>
+                    <td class="title" style="width: 110px;">${circulationUser.state!}:</td>
+                    <td class="concat">${circulationUser.remarks!}<span style="color: #ffffff;">${circulationUser.userId?c}</span></td>
+                </tr>
+            </#if>
+        </#list>
+        <#list executors as executor>
+            <tr>
+                <#if executor_index=0>
+                    <td rowspan="${executors?size}" class="title">执行:</td>
+                </#if>
+                <td class="title" style="width: 110px;">${executor.state!}:</td>
+                <td class="concat">${executor.remarks!}<span style="color: #ffffff;">${executor.userId?c}</span></td>
+            </tr>
+        </#list>
+    </table>
+</div>
+</body>
+</html>

mec-biz/src/main/resources/config/mybatis/EmployeeMapper.xml

@@ -23,8 +23,9 @@
         <result column="demission_date_" property="demissionDate"/>
         <result column="contact_address_" property="contactAddress"/>
         <result column="postal_code_" property="postalCode"/>
-        <result column="dept_id_" property="deptId"/>
-        <result column="post_id_" property="postId"/>
+        <result column="dept_ids_" property="deptIds"/>
+        <result column="post_ids_" property="postIds"/>
+        <result column="post_dept_ids_" property="postDeptIds"/>
         <result column="bank_card_" property="bankCard"/>
         <result column="open_bank_address_" property="openBankAddress"/>
     </resultMap>
@@ -49,6 +50,7 @@
         <result column="birthdate_" property="birthdate"/>
         <result column="email_" property="email"/>
         <result column="im_token_" property="imToken"/>
+        <result column="real_name_" property="realName"/>
         <result column="id_card_no_" property="idCardNo"/>
         <result column="wechat_id_" property="wechatId"/>
     </resultMap>
@@ -73,9 +75,9 @@
         -->
         INSERT INTO employee
         (user_id_,organ_id_list_,job_nature_,is_probation_period_,education_background_,graduate_school_,technical_titles_,
-        entry_date_,certificate_type_,certificate_num_,update_time_,create_time_,introduction_,demission_date_,contact_address_,postal_code_)
+        entry_date_,certificate_type_,certificate_num_,update_time_,create_time_,introduction_,demission_date_,contact_address_,postal_code_,dept_ids_,post_ids_,post_dept_ids_)
         VALUES(#{userId},#{organIdList},#{jobNature},#{isProbationPeriod},#{educationBackground},#{graduateSchool},
-        #{technicalTitles},#{entryDate},#{certificateType},#{certificateNum},now(),now(),#{introduction},#{demissionDate},#{contactAddress},#{postalCode})
+        #{technicalTitles},#{entryDate},#{certificateType},#{certificateNum},now(),now(),#{introduction},#{demissionDate},#{contactAddress},#{postalCode},#{deptIds},#{postIds},#{postDeptIds})
     </insert>
     <insert id="batchAddEmployeeRole">
         INSERT INTO sys_user_role(user_id_,role_id_) values
@@ -134,6 +136,15 @@
             <if test="demissionDate != null">
                 demission_date_ = #{demissionDate},
             </if>
+            <if test="deptIds != null">
+                dept_ids_ = #{deptIds},
+            </if>
+            <if test="postIds != null">
+                post_ids_ = #{postIds},
+            </if>
+            <if test="postDeptIds != null">
+                post_dept_ids_ = #{postDeptIds},
+            </if>
         </set>
         WHERE user_id_ = #{userId}
     </update>
@@ -190,6 +201,9 @@
         <result property="contactAddress" column="contact_address_"/>
         <result property="postalCode" column="postal_code_"/>
         <result property="organIdStr" column="organ_id_str_"/>
+        <result property="deptIds" column="dept_ids_"/>
+        <result property="postIds" column="post_ids_"/>
+        <result property="postDeptIds" column="post_dept_ids_"/>
         <collection property="roleNames" ofType="string" javaType="list">
             <result column="role_name_"/>
         </collection>
@@ -200,7 +214,7 @@
     <select id="queryEmployByOrganId" resultMap="EmployeeDto">
         SELECT ue.*,ue.organ_id_ organ_id_str_,sr.role_name_,sr.id_ role_id_
         FROM (SELECT e.user_id_,su.real_name_,su.gender_,su.phone_,su.user_type_,e.job_nature_,su.lock_flag_,
-        e.entry_date_,e.demission_date_,e.organ_id_list_ organ_id_,e.create_time_,e.contact_address_,e.postal_code_
+        e.entry_date_,e.demission_date_,e.organ_id_list_ organ_id_,e.create_time_,e.contact_address_,e.postal_code_,e.dept_ids_,e.post_ids_,e.post_dept_ids_
         FROM employee e
         LEFT JOIN sys_user su ON e.user_id_ = su.id_
         <if test="roleId != null">
@@ -375,4 +389,11 @@
         SELECT DISTINCT id_ FROM vip_group
         WHERE educational_teacher_id_ = #{levelUserId} AND group_status_ IN (2,6)
     </select>
+
+    <select id="getUsers" resultMap="SysUser">
+        select * from sys_user where id_ IN
+        <foreach collection="userIds" open="(" close=")" separator="," item="userId">
+            #{userId}
+        </foreach>
+    </select>
 </mapper>

mec-client-api/src/main/java/com/ym/mec/oa/OaFeignService.java

@@ -0,0 +1,52 @@
+package com.ym.mec.oa;
+
+import com.ym.mec.common.config.FeignConfiguration;
+import com.ym.mec.common.entity.*;
+import com.ym.mec.oa.entity.OAUser;
+import com.ym.mec.oa.fallback.OaFeignServiceFallback;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+@FeignClient(name = "oa-server", url = "http://localhost:8002/api/v1", configuration = FeignConfiguration.class, fallback = OaFeignServiceFallback.class)
+public interface OaFeignService {
+
+    /**
+     * 用户注册
+     *
+     * @param oaUser
+     * @return
+     */
+    @PostMapping(value = "/register", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Object register(@RequestBody OAUser oaUser);
+
+    /**
+     * 用户信息修改
+     *
+     * @param oaUser
+     * @return
+     */
+    @PostMapping(value = "/updateUser", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Object updateUser(@RequestBody OAUser oaUser);
+
+    /**
+     * 软删除
+     *
+     * @param oaUser
+     * @return
+     */
+    @PostMapping(value = "/softDelMecUser", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Object delUser(@RequestBody OAUser oaUser);
+
+
+    /**
+     * 恢复软删除的用户
+     *
+     * @param oaUser
+     * @return
+     */
+    @PostMapping(value = "/reInsertMecUser", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Object reInsertUser(@RequestBody OAUser oaUser);
+
+}

mec-client-api/src/main/java/com/ym/mec/oa/entity/OAUser.java

@@ -0,0 +1,95 @@
+package com.ym.mec.oa.entity;
+
+import java.util.List;
+
+public class OAUser {
+    private Integer mecUserId;
+
+    private String nickName;
+
+    private String userName;
+
+    private String phone;
+
+    private String avatar;
+
+    private String sex;
+
+    private List<Integer> deptIds;
+
+    private List<Integer> postIds;
+
+    private List<PostDept> postDeptIds;
+
+    public List<PostDept> getPostDeptIds() {
+        return postDeptIds;
+    }
+
+    public void setPostDeptIds(List<PostDept> postDeptIds) {
+        this.postDeptIds = postDeptIds;
+    }
+
+    public Integer getMecUserId() {
+        return mecUserId;
+    }
+
+    public void setMecUserId(Integer mecUserId) {
+        this.mecUserId = mecUserId;
+    }
+
+    public String getNickName() {
+        return nickName;
+    }
+
+    public void setNickName(String nickName) {
+        this.nickName = nickName;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public String getAvatar() {
+        return avatar;
+    }
+
+    public void setAvatar(String avatar) {
+        this.avatar = avatar;
+    }
+
+    public List<Integer> getDeptIds() {
+        return deptIds;
+    }
+
+    public void setDeptIds(List<Integer> deptIds) {
+        this.deptIds = deptIds;
+    }
+
+    public List<Integer> getPostIds() {
+        return postIds;
+    }
+
+    public void setPostIds(List<Integer> postIds) {
+        this.postIds = postIds;
+    }
+
+    public String getSex() {
+        return sex;
+    }
+
+    public void setSex(String sex) {
+        this.sex = sex;
+    }
+}

mec-client-api/src/main/java/com/ym/mec/oa/entity/PostDept.java

@@ -0,0 +1,25 @@
+package com.ym.mec.oa.entity;
+
+import java.util.List;
+
+public class PostDept {
+    private Integer postId;
+
+    private List<Integer> deptIds;
+
+    public Integer getPostId() {
+        return postId;
+    }
+
+    public void setPostId(Integer postId) {
+        this.postId = postId;
+    }
+
+    public List<Integer> getDeptIds() {
+        return deptIds;
+    }
+
+    public void setDeptIds(List<Integer> deptIds) {
+        this.deptIds = deptIds;
+    }
+}

mec-client-api/src/main/java/com/ym/mec/oa/fallback/OaFeignServiceFallback.java

@@ -0,0 +1,29 @@
+package com.ym.mec.oa.fallback;
+
+import com.ym.mec.oa.OaFeignService;
+import com.ym.mec.oa.entity.OAUser;
+import org.springframework.stereotype.Component;
+
+@Component
+public class OaFeignServiceFallback implements OaFeignService {
+    @Override
+    public Object register(OAUser oaUser) {
+        return null;
+    }
+
+    @Override
+    public Object updateUser(OAUser oaUser) {
+        return null;
+    }
+
+    @Override
+    public Object delUser(OAUser oaUser) {
+        return null;
+    }
+
+    @Override
+    public Object reInsertUser(OAUser oaUser) {
+        return null;
+    }
+
+}

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/eseal/ESealPlugin.java

@@ -2,63 +2,82 @@ package com.ym.mec.thirdparty.eseal;
 
 public interface ESealPlugin {
 
-	/**
-	 * 创建用户账户(个人)
-	 * @param realName 姓名
-	 * @param idcard 身份证号码
-	 * @param mobile 手机号码
-	 * @return 账户唯一标识
-	 */
-	public String createUserAccount(String realName, String idcard, String mobile);
+    /**
+     * 创建用户账户(个人)
+     *
+     * @param realName 姓名
+     * @param idcard   身份证号码
+     * @param mobile   手机号码
+     * @return 账户唯一标识
+     */
+    public String createUserAccount(String realName, String idcard, String mobile);
 
-	/**
-	 * 创建用户账户(企业)
-	 * @param orgName  机构名称
-	 * @param organCode 统一社会信用代码
-	 * @return 账户唯一标识
-	 */
-	public String createOrganAccount(String orgName, String organCode);
+    /**
+     * 创建用户账户(企业)
+     *
+     * @param orgName   机构名称
+     * @param organCode 统一社会信用代码
+     * @return 账户唯一标识
+     */
+    public String createOrganAccount(String orgName, String organCode);
 
-	/**
-	 * 创建个人印章
-	 * @param accountId 账户唯一标识
-	 * @return 电子印章数据
-	 */
-	public String createUserSeal(String accountId);
+    /**
+     * 创建个人印章
+     *
+     * @param accountId 账户唯一标识
+     * @return 电子印章数据
+     */
+    public String createUserSeal(String accountId);
 
-	/**
-	 * 创建企业印章
-	 * @param accountId 账户唯一标识
-	 * @param hText 生成印章中的横向文内容
-	 * @param qText 生成印章中的下弦文内容
-	 * @return 电子印章数据
-	 */
-	public String createOrganSeal(String accountId, String hText, String qText);
+    /**
+     * 创建企业印章
+     *
+     * @param accountId 账户唯一标识
+     * @param hText     生成印章中的横向文内容
+     * @param qText     生成印章中的下弦文内容
+     * @return 电子印章数据
+     */
+    public String createOrganSeal(String accountId, String hText, String qText);
 
-	/**
-	 * 平台自身PDF摘要签署（印章标识）
-	 * @param srcPdfPath 源文件
-	 * @param destPdfPath 签名后的目标文件
-	 * @return
-	 */
-	public boolean platformSign(String srcPdfPath, String destPdfPath);
+    /**
+     * 平台自身PDF摘要签署（印章标识）
+     *
+     * @param srcPdfPath  源文件
+     * @param destPdfPath 签名后的目标文件
+     * @return
+     */
+    public boolean platformSign(String srcPdfPath, String destPdfPath);
 
-	/**
-	 * 企业PDF摘要签署（印章图片）
-	 * @param sealData 电子印章数据
-	 * @param srcPdfPath 源文件
-	 * @param destPdfPath 签名后的目标文件
-	 * @return
-	 */
-	public boolean organSign(String sealData, String srcPdfPath, String destPdfPath);
+    /**
+     * 企业PDF摘要签署（印章图片）
+     *
+     * @param sealData    电子印章数据
+     * @param srcPdfPath  源文件
+     * @param destPdfPath 签名后的目标文件
+     * @return
+     */
+    public boolean organSign(String sealData, String srcPdfPath, String destPdfPath);
 
-	/**
-	 * 用户签名
-	 * @param accountId 账户唯一标识
-	 * @param sealData 电子印章数据
-	 * @param srcPdfPath 平台签名后的源文件
-	 * @param destPdfPath 平台、用户都签名后的文件地址
-	 * @return
-	 */
-	public boolean userSign(String accountId, String sealData, String srcPdfPath, String destPdfPath);
+    /**
+     * 用户签名
+     *
+     * @param accountId   账户唯一标识
+     * @param sealData    电子印章数据
+     * @param srcPdfPath  平台签名后的源文件
+     * @param destPdfPath 平台、用户都签名后的文件地址
+     * @return
+     */
+    public boolean userSign(String accountId, String sealData, String srcPdfPath, String destPdfPath);
+
+    /**
+     * 用户签名
+     *
+     * @param accountId   账户唯一标识
+     * @param sealData    电子印章数据
+     * @param keyWorld    印章关键字
+     * @param srcPdfPath  平台签名后的源文件
+     * @param destPdfPath 平台、用户都签名后的文件地址
+     * @return
+     */
+     boolean userSign(String accountId, String sealData, String keyWorld, String srcPdfPath, String destPdfPath);
 }

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/eseal/provider/TsignPlugin.java

@@ -35,226 +35,266 @@ import com.ym.mec.thirdparty.exception.ThirdpartyException;
 @Service
 public class TsignPlugin implements ESealPlugin, InitializingBean, DisposableBean {
 
-	@Value("${eseal.tsign.projectid:4438776254}")
-	public String projectId; // = "1111563517";
+    @Value("${eseal.tsign.projectid:4438776254}")
+    public String projectId; // = "1111563517";
 
-	@Value("${eseal.tsign.projectSecret:a94cf63d6361084d232f345d71321691}")
-	public String projectSecret; // = "95439b0863c241c63a861b87d1e647b7";
+    @Value("${eseal.tsign.projectSecret:a94cf63d6361084d232f345d71321691}")
+    public String projectSecret; // = "95439b0863c241c63a861b87d1e647b7";
 
-	@Value("${eseal.tsign.apisUrl:http://smlitsm.tsign.cn:8080/tgmonitor/rest/app!getAPIInfo2}")
-	public String apisUrl; // = "http://smlitsm.tsign.cn:8080/tgmonitor/rest/app!getAPIInfo2";
+    @Value("${eseal.tsign.apisUrl:http://smlitsm.tsign.cn:8080/tgmonitor/rest/app!getAPIInfo2}")
+    public String apisUrl; // = "http://smlitsm.tsign.cn:8080/tgmonitor/rest/app!getAPIInfo2";
 
-	private ServiceClient serviceClient;
+    private ServiceClient serviceClient;
 
-	public static String getName() {
-		return "Tsign";
-	}
+    public static String getName() {
+        return "Tsign";
+    }
 
-	@Override
-	public void afterPropertiesSet(){
-		ProjectConfig projectconfig = new ProjectConfig();
-		projectconfig.setProjectId(projectId);
-		projectconfig.setProjectSecret(projectSecret);
-		projectconfig.setItsmApiUrl(apisUrl);
-		Result result = ServiceClientManager.registClient(projectconfig, null, null);
-		if (result.getErrCode() != 0) {
-			throw new ThirdpartyException("e签宝客户端注册失败:{}", result.getMsg());
-		}
+    @Override
+    public void afterPropertiesSet() {
+        ProjectConfig projectconfig = new ProjectConfig();
+        projectconfig.setProjectId(projectId);
+        projectconfig.setProjectSecret(projectSecret);
+        projectconfig.setItsmApiUrl(apisUrl);
+        Result result = ServiceClientManager.registClient(projectconfig, null, null);
+        if (result.getErrCode() != 0) {
+            throw new ThirdpartyException("e签宝客户端注册失败:{}", result.getMsg());
+        }
 
-		serviceClient = ServiceClientManager.get(projectId);
-		if (serviceClient == null) {
-			throw new ThirdpartyException("获取e签宝客户端失败");
-		}
-	}
+        serviceClient = ServiceClientManager.get(projectId);
+        if (serviceClient == null) {
+            throw new ThirdpartyException("获取e签宝客户端失败");
+        }
+    }
 
-	@Override
-	public void destroy() throws Exception {
-		ServiceClientManager.shutdown(projectId);
-	}
+    @Override
+    public void destroy() throws Exception {
+        ServiceClientManager.shutdown(projectId);
+    }
 
-	/**
-	 * 创建用户账户(个人)
-	 * @param realName 姓名
-	 * @param idcard 身份证号码
-	 * @param mobile 手机号码
-	 * @return e签宝账户唯一标识
-	 */
-	public String createUserAccount(String realName, String idcard, String mobile) {
-		PersonBean personbean = new PersonBean();
-		personbean.setName(realName);
-		personbean.setIdNo(idcard);
-		personbean.setMobile(mobile);
-		personbean.setPersonArea(LegalAreaType.MAINLAND);
-		// personbean.setPersonArea(4);
-		AccountService service = serviceClient.accountService();
-		AddAccountResult result = service.addAccount(personbean);
-		if (result.getErrCode() == 0) {
-			return result.getAccountId();
-		} else if (result.getErrCode() == 1500012) {
-			return queryAccountIdByIdNo(idcard);
-		}
-		throw new ThirdpartyException(result.getMsg());
-	}
+    /**
+     * 创建用户账户(个人)
+     *
+     * @param realName 姓名
+     * @param idcard   身份证号码
+     * @param mobile   手机号码
+     * @return e签宝账户唯一标识
+     */
+    public String createUserAccount(String realName, String idcard, String mobile) {
+        PersonBean personbean = new PersonBean();
+        personbean.setName(realName);
+        personbean.setIdNo(idcard);
+        personbean.setMobile(mobile);
+        personbean.setPersonArea(LegalAreaType.MAINLAND);
+        // personbean.setPersonArea(4);
+        AccountService service = serviceClient.accountService();
+        AddAccountResult result = service.addAccount(personbean);
+        if (result.getErrCode() == 0) {
+            return result.getAccountId();
+        } else if (result.getErrCode() == 1500012) {
+            return queryAccountIdByIdNo(idcard);
+        }
+        throw new ThirdpartyException(result.getMsg());
+    }
 
-	/**
-	 * 创建用户账户(企业)
-	 * @param orgName  机构名称
-	 * @param organCode 统一社会信用代码
-	 * @return e签宝账户唯一标识
-	 */
-	public String createOrganAccount(String orgName, String organCode) {
-		OrganizeBean organizeBean = new OrganizeBean();
-		organizeBean.setName(orgName);
-		organizeBean.setOrganCode(organCode);
-		organizeBean.setRegType(OrganRegType.MERGE);
-		organizeBean.setUserType(0);
+    /**
+     * 创建用户账户(企业)
+     *
+     * @param orgName   机构名称
+     * @param organCode 统一社会信用代码
+     * @return e签宝账户唯一标识
+     */
+    public String createOrganAccount(String orgName, String organCode) {
+        OrganizeBean organizeBean = new OrganizeBean();
+        organizeBean.setName(orgName);
+        organizeBean.setOrganCode(organCode);
+        organizeBean.setRegType(OrganRegType.MERGE);
+        organizeBean.setUserType(0);
 
-		AccountService service = serviceClient.accountService();
-		AddAccountResult result = service.addAccount(organizeBean);
-		if (result.getErrCode() == 0) {
-			return result.getAccountId();
-		}
-		throw new ThirdpartyException("创建企业账户接口调用失败code=" + result.getErrCode() + "msg=" + result.getMsg());
-	}
+        AccountService service = serviceClient.accountService();
+        AddAccountResult result = service.addAccount(organizeBean);
+        if (result.getErrCode() == 0) {
+            return result.getAccountId();
+        }
+        throw new ThirdpartyException("创建企业账户接口调用失败code=" + result.getErrCode() + "msg=" + result.getMsg());
+    }
 
-	/**
-	 * 创建印章
-	 * @param accountId e签宝账户唯一标识
-	 * @return 电子印章数据
-	 */
-	public String createUserSeal(String accountId) {
-		// 生成模板印章的颜色
-		SealColor color = SealColor.RED;
-		SealService service = serviceClient.sealService();
-		AddSealResult result = service.addTemplateSeal(accountId, PersonTemplateType.RECTANGLE, color);
-		if (0 == result.getErrCode()) {
-			return result.getSealData();
-		}
-		throw new ThirdpartyException("个人模板印章接口调用失败code=" + result.getErrCode() + "msg=" + result.getMsg());
-	}
+    /**
+     * 创建印章
+     *
+     * @param accountId e签宝账户唯一标识
+     * @return 电子印章数据
+     */
+    public String createUserSeal(String accountId) {
+        // 生成模板印章的颜色
+        SealColor color = SealColor.RED;
+        SealService service = serviceClient.sealService();
+        AddSealResult result = service.addTemplateSeal(accountId, PersonTemplateType.RECTANGLE, color);
+        if (0 == result.getErrCode()) {
+            return result.getSealData();
+        }
+        throw new ThirdpartyException("个人模板印章接口调用失败code=" + result.getErrCode() + "msg=" + result.getMsg());
+    }
 
-	@Override
-	public String createOrganSeal(String accountId, String hText, String qText) {
-		// 生成模板印章的颜色
-		SealColor color = SealColor.RED;
-		SealService service = serviceClient.sealService();
-		AddSealResult result = service.addTemplateSeal(accountId, OrganizeTemplateType.STAR, color, hText, qText);
-		if (0 == result.getErrCode()) {
-			return result.getSealData();
-		}
-		throw new ThirdpartyException("企业模板印章接口调用失败code=" + result.getErrCode() + "msg=" + result.getMsg());
-	}
+    @Override
+    public String createOrganSeal(String accountId, String hText, String qText) {
+        // 生成模板印章的颜色
+        SealColor color = SealColor.RED;
+        SealService service = serviceClient.sealService();
+        AddSealResult result = service.addTemplateSeal(accountId, OrganizeTemplateType.STAR, color, hText, qText);
+        if (0 == result.getErrCode()) {
+            return result.getSealData();
+        }
+        throw new ThirdpartyException("企业模板印章接口调用失败code=" + result.getErrCode() + "msg=" + result.getMsg());
+    }
 
-	/**
-	 * 平台自身PDF摘要签署（印章标识）
-	 * @param srcPdfPath 源文件
-	 * @param destPdfPath 签名后的目标文件
-	 * @return
-	 */
-	public boolean platformSign(String srcPdfPath, String destPdfPath) {
-		PosBean posBean = new PosBean();
-		// 签章类型,Single-单页签章、Multi-多页签章、Edges-骑缝章、Key-关键字签章
-		SignType signType = SignType.Key;
-		// 接口调用方(平台方)的印章,请在www.tsign.cn官网中设置默认印章其sealId值为0
-		int sealId = 0;
-		// 设置接口调用方(平台方)签章位置信息
-		posBean.setPosPage("1");// 签署页码，若为多页签章，支持页码格式“1-3,5,8“，若为坐标定位时，不可空
-		posBean.setKey("甲方签章");
-		// 签署位置X坐标,默认值为0,以pdf页面的左下角作为原点,控制距离页面左端的横向移动距离,单位为px
-		posBean.setPosX(100);
-		// 签署位置Y坐标,默认值为0,以pdf页面的左下角作为原点,控制距离页面底端的纵向移动距离,单位为px
-		posBean.setPosY(0);
-		// 印章图片在PDF文件中的等比缩放大小,公章标准大小为4.2厘米即159px
-		posBean.setWidth(100);
-		SignPDFFileBean PDFbean = new SignPDFFileBean();
-		PDFbean.setSrcPdfFile(srcPdfPath);
-		PDFbean.setDstPdfFile(destPdfPath);
+    /**
+     * 平台自身PDF摘要签署（印章标识）
+     *
+     * @param srcPdfPath  源文件
+     * @param destPdfPath 签名后的目标文件
+     * @return
+     */
+    public boolean platformSign(String srcPdfPath, String destPdfPath) {
+        PosBean posBean = new PosBean();
+        // 签章类型,Single-单页签章、Multi-多页签章、Edges-骑缝章、Key-关键字签章
+        SignType signType = SignType.Key;
+        // 接口调用方(平台方)的印章,请在www.tsign.cn官网中设置默认印章其sealId值为0
+        int sealId = 0;
+        // 设置接口调用方(平台方)签章位置信息
+        posBean.setPosPage("1");// 签署页码，若为多页签章，支持页码格式“1-3,5,8“，若为坐标定位时，不可空
+        posBean.setKey("甲方签章");
+        // 签署位置X坐标,默认值为0,以pdf页面的左下角作为原点,控制距离页面左端的横向移动距离,单位为px
+        posBean.setPosX(100);
+        // 签署位置Y坐标,默认值为0,以pdf页面的左下角作为原点,控制距离页面底端的纵向移动距离,单位为px
+        posBean.setPosY(0);
+        // 印章图片在PDF文件中的等比缩放大小,公章标准大小为4.2厘米即159px
+        posBean.setWidth(100);
+        SignPDFFileBean PDFbean = new SignPDFFileBean();
+        PDFbean.setSrcPdfFile(srcPdfPath);
+        PDFbean.setDstPdfFile(destPdfPath);
 
-		SelfSignService service = serviceClient.selfSignService();
-		FileDigestSignResult result = service.localSignPdf(PDFbean, posBean, sealId, signType);
-		if (0 != result.getErrCode()) {
-			throw new ThirdpartyException("平台自身PDF摘要签署接口调用失败！Code=" + result.getErrCode() + "MSG=" + result.getMsg());
-		}
-		return true;
-	}
+        SelfSignService service = serviceClient.selfSignService();
+        FileDigestSignResult result = service.localSignPdf(PDFbean, posBean, sealId, signType);
+        if (0 != result.getErrCode()) {
+            throw new ThirdpartyException("平台自身PDF摘要签署接口调用失败！Code=" + result.getErrCode() + "MSG=" + result.getMsg());
+        }
+        return true;
+    }
 
-	/**
-	 * 企业PDF摘要签署（印章图片）
-	 * @param sealData 电子印章数据
-	 * @param srcPdfPath 源文件
-	 * @param destPdfPath 签名后的目标文件
-	 * @return
-	 */
-	public boolean organSign(String sealData, String srcPdfPath, String destPdfPath) {
-		PosBean posBean = new PosBean();
-		// 签章类型,Single-单页签章、Multi-多页签章、Edges-骑缝章、Key-关键字签章
-		SignType signType = SignType.Key;
-		// 设置接口调用方(平台方)签章位置信息
-		posBean.setPosPage("1");// 签署页码，若为多页签章，支持页码格式“1-3,5,8“，若为坐标定位时，不可空
-		posBean.setKey("甲方签章");
-		// 签署位置X坐标,默认值为0,以pdf页面的左下角作为原点,控制距离页面左端的横向移动距离,单位为px
-		posBean.setPosX(100);
-		// 签署位置Y坐标,默认值为0,以pdf页面的左下角作为原点,控制距离页面底端的纵向移动距离,单位为px
-		posBean.setPosY(0);
-		// 印章图片在PDF文件中的等比缩放大小,公章标准大小为4.2厘米即159px
-		posBean.setWidth(100);
-		SignPDFFileBean PDFbean = new SignPDFFileBean();
-		PDFbean.setSrcPdfFile(srcPdfPath);
-		PDFbean.setDstPdfFile(destPdfPath);
+    /**
+     * 企业PDF摘要签署（印章图片）
+     *
+     * @param sealData    电子印章数据
+     * @param srcPdfPath  源文件
+     * @param destPdfPath 签名后的目标文件
+     * @return
+     */
+    public boolean organSign(String sealData, String srcPdfPath, String destPdfPath) {
+        PosBean posBean = new PosBean();
+        // 签章类型,Single-单页签章、Multi-多页签章、Edges-骑缝章、Key-关键字签章
+        SignType signType = SignType.Key;
+        // 设置接口调用方(平台方)签章位置信息
+        posBean.setPosPage("1");// 签署页码，若为多页签章，支持页码格式“1-3,5,8“，若为坐标定位时，不可空
+        posBean.setKey("甲方签章");
+        // 签署位置X坐标,默认值为0,以pdf页面的左下角作为原点,控制距离页面左端的横向移动距离,单位为px
+        posBean.setPosX(100);
+        // 签署位置Y坐标,默认值为0,以pdf页面的左下角作为原点,控制距离页面底端的纵向移动距离,单位为px
+        posBean.setPosY(0);
+        // 印章图片在PDF文件中的等比缩放大小,公章标准大小为4.2厘米即159px
+        posBean.setWidth(100);
+        SignPDFFileBean PDFbean = new SignPDFFileBean();
+        PDFbean.setSrcPdfFile(srcPdfPath);
+        PDFbean.setDstPdfFile(destPdfPath);
 
-		SelfSignService service = serviceClient.selfSignService();
-		FileDigestSignResult result = service.localSignPdf(PDFbean, posBean, sealData, signType);
-		if (0 != result.getErrCode()) {
-			throw new ThirdpartyException("平台自身PDF摘要签署接口调用失败！Code=" + result.getErrCode() + "MSG=" + result.getMsg());
-		}
-		return true;
-	}
+        SelfSignService service = serviceClient.selfSignService();
+        FileDigestSignResult result = service.localSignPdf(PDFbean, posBean, sealData, signType);
+        if (0 != result.getErrCode()) {
+            throw new ThirdpartyException("平台自身PDF摘要签署接口调用失败！Code=" + result.getErrCode() + "MSG=" + result.getMsg());
+        }
+        return true;
+    }
 
-	/**
-	 * 用户签名
-	 * @param accountId e签宝账户唯一标识
-	 * @param sealData 电子印章数据
-	 * @param srcPdfPath 平台签名后的源文件
-	 * @param destPdfPath 平台、用户都签名后的文件地址
-	 * @return
-	 */
-	public boolean userSign(String accountId, String sealData, String srcPdfPath, String destPdfPath) {
+    /**
+     * 用户签名
+     *
+     * @param accountId   e签宝账户唯一标识
+     * @param sealData    电子印章数据
+     * @param srcPdfPath  平台签名后的源文件
+     * @param destPdfPath 平台、用户都签名后的文件地址
+     * @return
+     */
+    public boolean userSign(String accountId, String sealData, String srcPdfPath, String destPdfPath) {
 
-		SignPDFFileBean signPDFStreamBean = new SignPDFFileBean();
-		// C:test_signed.pdf为平台自身签署后路径
-		signPDFStreamBean.setSrcPdfFile(srcPdfPath);
-		signPDFStreamBean.setDstPdfFile(destPdfPath);
-		PosBean posBean = new PosBean();
-		posBean.setPosPage("1");
-		posBean.setPosType(1);
-		posBean.setWidth(80);
-		posBean.setKey("乙方签章");
-		posBean.setPosX(100);
-		posBean.setPosY(0);
+        SignPDFFileBean signPDFStreamBean = new SignPDFFileBean();
+        // C:test_signed.pdf为平台自身签署后路径
+        signPDFStreamBean.setSrcPdfFile(srcPdfPath);
+        signPDFStreamBean.setDstPdfFile(destPdfPath);
+        PosBean posBean = new PosBean();
+        posBean.setPosPage("1");
+        posBean.setPosType(1);
+        posBean.setWidth(80);
+        posBean.setKey("乙方签章");
+        posBean.setPosX(100);
+        posBean.setPosY(0);
 
-		// 签章类型,Single-单页签章、Multi-多页签章、Edges-骑缝章、Key-关键字签章
-		SignType signtype = SignType.Key;
-		UserSignService service = serviceClient.userSignService();
-		FileDigestSignResult result = service.localSignPDF(accountId, sealData, signPDFStreamBean, posBean, signtype);
-		if (result.getErrCode() == 0) {
-			return true;
-		}
-		throw new ThirdpartyException("平台用户PDF摘要签署接口调用失败" + result.getErrCode() + "msg=" + result.getMsg());
-	}
+        // 签章类型,Single-单页签章、Multi-多页签章、Edges-骑缝章、Key-关键字签章
+        SignType signtype = SignType.Key;
+        UserSignService service = serviceClient.userSignService();
+        FileDigestSignResult result = service.localSignPDF(accountId, sealData, signPDFStreamBean, posBean, signtype);
+        if (result.getErrCode() == 0) {
+            return true;
+        }
+        throw new ThirdpartyException("平台用户PDF摘要签署接口调用失败" + result.getErrCode() + "msg=" + result.getMsg());
+    }
 
-	private String queryAccountIdByIdNo(String idcardNo) {
+    private String queryAccountIdByIdNo(String idcardNo) {
 
-		AccountService service = serviceClient.accountService();
+        AccountService service = serviceClient.accountService();
 
-		GetAccountProfileResult result = service.getAccountInfoByIdNo(idcardNo, LicenseQueryType.MAINLAND);
+        GetAccountProfileResult result = service.getAccountInfoByIdNo(idcardNo, LicenseQueryType.MAINLAND);
 
-		if (result != null) {
-			AccountProfile accountProfile = result.getAccountInfo();
-			if (accountProfile != null) {
-				return accountProfile.getAccountUid();
-			}
-		}
+        if (result != null) {
+            AccountProfile accountProfile = result.getAccountInfo();
+            if (accountProfile != null) {
+                return accountProfile.getAccountUid();
+            }
+        }
 
-		return null;
-	}
+        return null;
+    }
+
+    /**
+     * 用户签名
+     *
+     * @param accountId   e签宝账户唯一标识
+     * @param sealData    电子印章数据
+     * @param keyWorld    印章关键字
+     * @param srcPdfPath  平台签名后的源文件
+     * @param destPdfPath 平台、用户都签名后的文件地址
+     * @return
+     */
+    public boolean userSign(String accountId, String sealData, String keyWorld, String srcPdfPath, String destPdfPath) {
+
+        SignPDFFileBean signPDFStreamBean = new SignPDFFileBean();
+        // C:test_signed.pdf为平台自身签署后路径
+        signPDFStreamBean.setSrcPdfFile(srcPdfPath);
+        signPDFStreamBean.setDstPdfFile(destPdfPath);
+        PosBean posBean = new PosBean();
+        posBean.setPosPage("1");
+        posBean.setPosType(1);
+        posBean.setWidth(80);
+        posBean.setKey(keyWorld);
+        posBean.setPosX(100);
+        posBean.setPosY(0);
+
+        // 签章类型,Single-单页签章、Multi-多页签章、Edges-骑缝章、Key-关键字签章
+        SignType signtype = SignType.Key;
+        UserSignService service = serviceClient.userSignService();
+        FileDigestSignResult result = service.localSignPDF(accountId, sealData, signPDFStreamBean, posBean, signtype);
+        if (result.getErrCode() == 0) {
+            return true;
+        }
+        throw new ThirdpartyException("平台用户PDF摘要签署接口调用失败" + result.getErrCode() + "msg=" + result.getMsg());
+    }
 }

mec-web/src/main/java/com/ym/mec/web/config/ResourceServerConfig.java

@@ -16,31 +16,33 @@ import com.ym.mec.common.security.BaseAuthenticationEntryPoint;
 @EnableGlobalMethodSecurity(prePostEnabled = true)
 public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
 
-	@Autowired
-	private BaseAccessDeniedHandler baseAccessDeniedHandler;
-
-	@Autowired
-	private BaseAuthenticationEntryPoint baseAuthenticationEntryPoint;
-
-	@Override
-	public void configure(HttpSecurity http) throws Exception {
-		http.csrf()
-				.disable()
-				.exceptionHandling()
-				.accessDeniedHandler(baseAccessDeniedHandler)
-				.authenticationEntryPoint(baseAuthenticationEntryPoint)
-				.and()
-				.authorizeRequests()
-				.antMatchers("/task/**")
-				.hasIpAddress("0.0.0.0/0")
-				.antMatchers("/v2/api-docs", "/classGroup/highClassGroups", "/code/*", "/api/*", "/appVersionInfo/queryByPlatform", "/eduDegree/*",
-						"/uploadFile", "/eduContracts/queryProduceContract","/activity/doubleEleven2020Statis","/replacementInstrument/queryPage",
-						"/replacementInstrumentActivity/queryReplacementsStat","/eduStudentRegistration/queryPreApplyList","/eduSubject/findSubSubjects","/eduFinancialExpenditure/batchAdd","/eduSendNotice/*").permitAll().anyRequest().authenticated().and().httpBasic();
-	}
-
-	@Override
-	public void configure(ResourceServerSecurityConfigurer resources) throws Exception {
-		resources.authenticationEntryPoint(baseAuthenticationEntryPoint).accessDeniedHandler(baseAccessDeniedHandler);
-	}
+    @Autowired
+    private BaseAccessDeniedHandler baseAccessDeniedHandler;
+
+    @Autowired
+    private BaseAuthenticationEntryPoint baseAuthenticationEntryPoint;
+
+    @Override
+    public void configure(HttpSecurity http) throws Exception {
+        http.csrf()
+                .disable()
+                .exceptionHandling()
+                .accessDeniedHandler(baseAccessDeniedHandler)
+                .authenticationEntryPoint(baseAuthenticationEntryPoint)
+                .and()
+                .authorizeRequests()
+                .antMatchers("/task/**")
+                .hasIpAddress("0.0.0.0/0")
+                .antMatchers("/v2/api-docs", "/classGroup/highClassGroups", "/code/*", "/api/*", "/appVersionInfo/queryByPlatform", "/eduDegree/*",
+                        "/uploadFile", "/eduContracts/queryProduceContract", "/activity/doubleEleven2020Statis", "/replacementInstrument/queryPage",
+                        "/replacementInstrumentActivity/queryReplacementsStat", "/eduStudentRegistration/queryPreApplyList",
+                        "/eduSubject/findSubSubjects", "/eduFinancialExpenditure/batchAdd", "/eduSendNotice/*",
+                        "/oaContracts/*").permitAll().anyRequest().authenticated().and().httpBasic();
+    }
+
+    @Override
+    public void configure(ResourceServerSecurityConfigurer resources) throws Exception {
+        resources.authenticationEntryPoint(baseAuthenticationEntryPoint).accessDeniedHandler(baseAccessDeniedHandler);
+    }
 
 }

mec-web/src/main/java/com/ym/mec/web/controller/EmployeeController.java

@@ -136,10 +136,11 @@ public class EmployeeController extends BaseController {
             sysUser.setRoles(employeeDao.queryUserRole(sysUser.getId()));
             sysUser.setContactAddress(employee.getContactAddress());
             sysUser.setPostalCode(employee.getPostalCode());
-            sysUser.setDeptId(employee.getDeptId());
-            sysUser.setPostId(employee.getPostId());
+            sysUser.setDeptIds(employee.getDeptIds());
+            sysUser.setPostIds(employee.getPostIds());
             sysUser.setBankCard(employee.getBankCard());
             sysUser.setOpenBankAddress(employee.getOpenBankAddress());
+            sysUser.setPostDeptIds(employee.getPostDeptIds());
             return succeed(sysUser);
         }
         return failed("获取用户信息失败");

mec-web/src/main/java/com/ym/mec/web/controller/SysMusicScoreCategoriesController.java

@@ -18,7 +18,6 @@ public class SysMusicScoreCategoriesController extends BaseController {
     @Autowired
     private SysMusicScoreCategoriesService sysMusicScoreCategoriesService;
 
-
     @ApiOperation(value = "分页查询")
     @GetMapping("/queryPage")
     @PreAuthorize("@pcs.hasPermissions('sysMusicScoreCategories/queryPage')")

mec-web/src/main/java/com/ym/mec/web/controller/education/EduFeeTypeController.java

@@ -0,0 +1,38 @@
+package com.ym.mec.web.controller.education;
+
+import com.ym.mec.biz.dal.enums.ExpenditureTypeEnum;
+import com.ym.mec.biz.dal.enums.FeeProjectEnum;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.entity.HttpResponseResult;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@RequestMapping("eduFeeType")
+@Api(tags = "费用类型服务")
+@RestController
+public class EduFeeTypeController extends BaseController {
+
+    @PostMapping("getExpenditureType")
+    public HttpResponseResult<Map<Integer, String>> getExpenditureType() {
+        Map<Integer, String> typeMap = new HashMap<>();
+        for (ExpenditureTypeEnum val : ExpenditureTypeEnum.values()) {
+            typeMap.put(val.getCode(), val.getDesc());
+        }
+        return succeed(typeMap);
+    }
+
+    @PostMapping("getFeeProject")
+    public HttpResponseResult<Map<Integer, String>> getFeeProject() {
+        Map<Integer, String> typeMap = new HashMap<>();
+        for (FeeProjectEnum val : FeeProjectEnum.values()) {
+            typeMap.put(val.getCode(), val.getDesc());
+        }
+        return succeed(typeMap);
+    }
+
+}

mec-web/src/main/java/com/ym/mec/web/controller/education/EduFinancialExpenditureController.java

@@ -31,26 +31,11 @@ import java.util.stream.Collectors;
 public class EduFinancialExpenditureController extends BaseController {
     @Autowired
     private FinancialExpenditureService financialExpenditureService;
-    @Autowired
-    private OrganizationDao organizationDao;
-    @Autowired
-    private CooperationOrganDao cooperationOrganDao;
 
     @ApiOperation(value = "批量添加支出记录")
     @PostMapping(value = "/batchAdd")
     public HttpResponseResult<List<FinancialExpenditure>> batchAdd(@RequestBody List<FinancialExpenditure> financialExpenditures) {
-        List<Organization> organs = organizationDao.findAllOrgans();
-        Map<String, Integer> organMap = organs.stream().collect(Collectors.toMap(Organization::getName, Organization::getId));
-        List<CooperationOrgan> cooperationOrgans = cooperationOrganDao.getAllCooperationOrgan();
-        Map<String, Integer> cooperationOrganMap = cooperationOrgans.stream().collect(Collectors.toMap(e -> e.getName() + e.getOrganId(), e -> e.getId()));
         for (FinancialExpenditure financialExpenditure : financialExpenditures) {
-            if (organMap.containsKey(financialExpenditure.getOrganName())) {
-                financialExpenditure.setOrganId(organMap.get(financialExpenditure.getOrganName()));
-            }
-            if (cooperationOrganMap.containsKey(financialExpenditure.getCooperationOrganName() + financialExpenditure.getOrganId())) {
-                Integer cooperationOrganId = cooperationOrganMap.get(financialExpenditure.getCooperationOrganName() + financialExpenditure.getOrganId());
-                financialExpenditure.setCooperationOrganId(cooperationOrganId);
-            }
             for (ExpenditureTypeEnum typeEnum : ExpenditureTypeEnum.values()) {
                 if (typeEnum.getDesc().equals(financialExpenditure.getFeeType())) {
                     financialExpenditure.setType(typeEnum);

mec-web/src/main/java/com/ym/mec/web/controller/education/EduMusicScoreController.java

@@ -0,0 +1,56 @@
+package com.ym.mec.web.controller.education;
+
+import com.ym.mec.auth.api.dto.MusicScoreQueryInfo;
+import com.ym.mec.biz.dal.enums.ClientTypeEnum;
+import com.ym.mec.biz.dal.page.SysExamSongQueryInfo;
+import com.ym.mec.biz.service.SysMusicScoreAccompanimentService;
+import com.ym.mec.biz.service.SysMusicScoreCategoriesService;
+import com.ym.mec.common.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RequestMapping("eduMusicScore")
+@Api(tags = "智能陪练")
+@RestController
+public class EduMusicScoreController extends BaseController {
+    @Autowired
+    private SysMusicScoreCategoriesService sysMusicScoreCategoriesService;
+    @Autowired
+    private SysMusicScoreAccompanimentService sysMusicScoreAccompanimentService;
+
+    @ApiOperation(value = "树状列表")
+    @GetMapping("/queryTree")
+    public Object queryTree(MusicScoreQueryInfo queryInfo) {
+        return succeed(sysMusicScoreCategoriesService.queryTree(queryInfo));
+    }
+
+    @ApiOperation(value = "分页查询")
+    @GetMapping("/queryPage")
+    public Object queryPage(SysExamSongQueryInfo queryInfo) {
+        return succeed(sysMusicScoreAccompanimentService.queryAll(queryInfo));
+    }
+
+    @ApiOperation(value = "分页查询")
+    @GetMapping("/queryPageLimit")
+    public Object queryPageLimit(SysExamSongQueryInfo queryInfo) {
+        String type = queryInfo.getType();
+        if(StringUtils.isEmpty(type)){
+            queryInfo.setType("ALL");
+        }
+        if(queryInfo.getClientType() == null){
+            queryInfo.setClientType(ClientTypeEnum.SMART_PRACTICE);
+        }
+        return succeed(sysMusicScoreAccompanimentService.queryScorePage(queryInfo));
+    }
+
+    @ApiOperation(value = "获取伴奏声部列表")
+    @GetMapping("/querySubjectIds")
+    public Object querySubjectIds() {
+        return succeed(sysMusicScoreAccompanimentService.querySubjectIds());
+    }
+}

mec-web/src/main/java/com/ym/mec/web/controller/education/EduOrganizationController.java

@@ -1,14 +1,18 @@
 package com.ym.mec.web.controller.education;
 
+import com.ym.mec.biz.dal.entity.CooperationOrgan;
 import com.ym.mec.biz.service.CooperationOrganService;
 import com.ym.mec.biz.service.OrganizationService;
 import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.entity.HttpResponseResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 @RequestMapping("eduOrganization")
 @Api(tags = "分部服务")
 @RestController
@@ -26,8 +30,8 @@ public class EduOrganizationController extends BaseController {
     }
 
     @ApiOperation(value = "根据分部id获取合作单位(学校)列表")
-    @GetMapping("/queryByOrganId")
-    public Object queryByOrganId(String organId) {
+    @GetMapping("/getOrganCooperation")
+    public HttpResponseResult<List<CooperationOrgan>> getOrganCooperation(String organId) {
         return succeed(cooperationOrganService.queryByOrganId(organId));
     }
 }

mec-web/src/main/java/com/ym/mec/web/controller/education/OaContractsController.java

@@ -0,0 +1,25 @@
+package com.ym.mec.web.controller.education;
+
+import com.ym.mec.biz.dal.dto.OAFinancialDto;
+import com.ym.mec.biz.service.ContractService;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.entity.HttpResponseResult;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+@RequestMapping("oaContracts")
+@Api(tags = "OA签章服务")
+@RestController
+public class OaContractsController extends BaseController {
+
+    @Autowired
+    private ContractService contractService;
+
+    @PostMapping("finance")
+    public HttpResponseResult<String> transferProduceContract(@RequestBody OAFinancialDto financialDto) {
+        String fileUrl = contractService.transferOaFinancial(financialDto);
+        return succeed(fileUrl);
+    }
+
+}