Przeglądaj źródła

报销暂停,开发更改流程

anderx 2 lat temu
rodzic
commit
a81b04607b

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

@@ -1206,7 +1206,7 @@
     <if test="roleType =='99999888'">
       and c.role_type  in ('99998','99988','99999','99989')
     </if>
-    <if test="roleType !='99999' and roleType !='99998'">
+    <if test="roleType !='99999' and roleType !='99998' and roleType !='99999888'">
       and c.role_type  in (#{roleType})
     </if>
   </select>

+ 1 - 1
src/main/java/com/goafanti/common/utils/WeChatUtils.java

@@ -94,7 +94,7 @@ public class WeChatUtils {
 	private Integer SendHttpPost(Map<String, Object> map, String url) {
 		JSONObject res=HttpUtils.httpPost(url, map);
 		if (res.get("errcode")!=null) {
-			LoggerUtils.debug(this.getClass(),"errcode={%s}",res.getInteger("errcode").toString());
+			LoggerUtils.error(this.getClass(),String.format("errcode={%s}",res.getInteger("errcode").toString()));
 			return res.getInteger("errcode");
 		}else {
 			return 1;

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

@@ -170,7 +170,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
         StringBuffer str=new StringBuffer();
         AdminListBo admin = adminMapper.getDeptNameByAid(useEa.getAid());
         if (status==1){
-            str=str.append("您有报销需要审核,").append("报销编号[").append(in.getId()).append("]").append("请查看并审核。");
+            str=str.append("您有报销需要审核,").append("报销编号[").append(in.getId()).append("]").append("请查看并审核。");
             if(useEa.getProcessStatus()== EAProcessStatus.FQ.getCode()){
                 //获取上级
                 aids.add(adminMapper.selectByPrimaryKey(admin.getSuperiorId()));
@@ -182,7 +182,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
                 newEa.setProcessStatus(EAProcessStatus.CWSH.getCode());
             }else if (useEa.getProcessStatus()== EAProcessStatus.CWSH.getCode()){
                 //获取部门负责人
-                List<Admin> list = adminMapper.listAdminBydepIdAndRoleType(admin.getId(), admin.getDepartmentId());
+                List<Admin> list = adminMapper.listAdminBydepIdAndRoleType(admin.getDepartmentId(), AFTConstants.SALESMAN_ADMIN);
                 if (!list.isEmpty())aids.addAll(list);
                 newEa.setProcessStatus(EAProcessStatus.ZJLSH.getCode());
             }else if (useEa.getProcessStatus()== EAProcessStatus.ZJLSH.getCode()){
@@ -195,11 +195,13 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
                 status =2;
                 aids.add(adminMapper.selectByPrimaryKey(admin.getId()));
                 newEa.setStatus(status);
-                str= str.append("您的报销审核已通过,请注意查看。");
+                str.setLength(0);
+                str=str.append("您的报销审核已通过,报销编号[").append(in.getId()).append("],请注意查看。");
             }
         }else {
             aids.add(adminMapper.selectByPrimaryKey(admin.getId()));
-            str=new StringBuffer("您的报销审核已驳回,请注意查看。");
+            str.setLength(0);
+            str=str.append("您的报销审核已驳回,报销编号[").append(in.getId()).append("],请注意查看。");
         }
         addLogAndNoticeAndEmail(in,  status,str.toString(),admin.getName(),aids);
     }