Browse Source

有效面谈逻辑修改

anderx 9 months ago
parent
commit
ee6e914136

+ 1 - 1
src/main/java/com/goafanti/common/dao/PublicReleaseMapper.java

@@ -28,7 +28,7 @@ public interface PublicReleaseMapper {
      * @param id 主键
      * @return 实例对象
      */
-    PublicRelease queryById(Integer id);
+    PublicRelease selectById(Integer id);
 
 
     /**

+ 1 - 1
src/main/java/com/goafanti/common/mapper/PublicReleaseMapper.xml

@@ -51,7 +51,7 @@
     </sql>
 
     <!--查询单个-->
-    <select id="queryById" resultMap="PublicReleaseMap">
+    <select id="selectById" resultMap="PublicReleaseMap">
         select
         <include refid="PublicReleaseAllSql"/>
         from public_release

+ 1 - 1
src/main/java/com/goafanti/expenseAccount/service/impl/ExpenseAccountServiceImpl.java

@@ -109,7 +109,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
     public Integer add(InputExpenseAccount in) {
         //如果关联公出,获取公出信息
         if (in.getPrid()!=null){
-            PublicRelease pr = publicReleaseMapper.queryById(in.getPrid());
+            PublicRelease pr = publicReleaseMapper.selectById(in.getPrid());
             in.setReleaseStart(pr.getReleaseStart());
             in.setReleaseEnd(pr.getReleaseEnd());
             in.setDistrictName(pr.getDistrictName());

+ 11 - 11
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -522,7 +522,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		Map checkOrderNo =null;
 
 		List<User> uses=null;
-		PublicRelease use = publicReleaseMapper.queryById(in.getId());
+		PublicRelease use = publicReleaseMapper.selectById(in.getId());
 		in.setCreateTime(use.getCreateTime());
 		String userNames=publicReleaseDetailsMapper.getNamesByPrid(in.getId());
 		PublicReleaseLog log=new PublicReleaseLog(in.getId(),TokenManager.getAdminId(),null,in.getReason(),date);
@@ -968,7 +968,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		Date date =new Date();
 		String aid=TokenManager.getAdminId();
 		p.setId(id);
-		PublicRelease use=publicReleaseMapper.queryById(id);
+		PublicRelease use=publicReleaseMapper.selectById(id);
 		if (use.getStatus()!=1) {
 			throw new BusinessException("只能修改发起的状态公出");
 		}
@@ -1158,7 +1158,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 
 	@Override
 	public Object updateAssistExamine(Integer id, Integer status, String remarks,Integer evaluateType) {
-		PublicRelease use = publicReleaseMapper.queryById(id);
+		PublicRelease use = publicReleaseMapper.selectById(id);
 		if (use.getAssistProcess()!=2){
 			throw new BusinessException("该公出不是待协单审核的公出。");
 		}
@@ -1516,8 +1516,8 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 	@Override
 	public int pushTechReject(Integer id,  String remarks) {
 		Integer status=0;
-		PublicRelease use=publicReleaseMapper.queryById(id);
-		PublicRelease mainPublic= publicReleaseMapper.queryById(use.getMainId());
+		PublicRelease use=publicReleaseMapper.selectById(id);
+		PublicRelease mainPublic= publicReleaseMapper.selectById(use.getMainId());
 		Admin ad=adminMapper.queryById(TokenManager.getAdminId());
 		StringBuffer str=new StringBuffer();
 		if (use.getAssist()!=2){
@@ -1832,7 +1832,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 	public List<outPublicReleaseLog> listPublicReleaseLog(Integer id,String ufid) {
 		List<outPublicReleaseLog> list=new ArrayList<>();
 		List<outPublicReleaseLog> log=publicReleaseLogMapper.listPublicReleaseLog(id,ufid);
-		PublicRelease e = publicReleaseMapper.queryById(id);
+		PublicRelease e = publicReleaseMapper.selectById(id);
 		List<PublicExamine> publicExamines = publicExamineMapper.selectByPrid(id);
 		if (e.getStatus()==1){
 			outPublicReleaseLog outPublicReleaseLog = new outPublicReleaseLog();
@@ -1895,7 +1895,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 	@Override
 	public int pushPublicReleaseClockIn(Integer id,String photoUrl,Integer clockIn ,String clockInRemarks ,String uid) {
 		if (clockIn == null) clockIn = 1;
-		PublicRelease use = publicReleaseMapper.queryById(id);
+		PublicRelease use = publicReleaseMapper.selectById(id);
 		if (use.getPublicType()==1||use.getPublicType()==3) {
 			return -1;
 		}
@@ -2629,7 +2629,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 
 	@Override
 	public int addAssistant(Integer id,String aid) {
-		PublicRelease p = publicReleaseMapper.queryById(id);
+		PublicRelease p = publicReleaseMapper.selectById(id);
 		List<String> list=new ArrayList<>();
 		if (StringUtils.isNotEmpty(p.getAssistantAid())){
 			list =new ArrayList<>(Arrays.asList(p.getAssistantAid().split(",")));
@@ -2751,7 +2751,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 
 	@Override
 	public int deleteAssistant(Integer id, String aid) {
-		PublicRelease p = publicReleaseMapper.queryById(id);
+		PublicRelease p = publicReleaseMapper.selectById(id);
 		if (p.getAssistantAid()==null){
 			throw new BusinessException("人员不存在");
 		}
@@ -2789,7 +2789,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 
 	@Override
 	public boolean checkdeleteAssistant(Integer id, String aid) {
-		PublicRelease p = publicReleaseMapper.queryById(id);
+		PublicRelease p = publicReleaseMapper.selectById(id);
 		List<PublicRelease> list = publicReleaseMapper.selectByMainId(p.getMainId(), 4, aid);
 		for (PublicRelease use : list) {
 //			if (use.getClockIn()==1){
@@ -2801,7 +2801,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 
 	@Override
 	public boolean checkaddAssistant(Integer id, String aid) {
-		PublicRelease p = publicReleaseMapper.queryById(id);
+		PublicRelease p = publicReleaseMapper.selectById(id);
 		List<PublicRelease> list = publicReleaseMapper.selectByMainId(p.getMainId(), 4, aid);
 		for (PublicRelease use : list) {
 			if (use.getAid().equals(aid)&&use.getStatus()!=3){