Explorar o código

修改外出申请审核通知修改为审核人

anderx %!s(int64=4) %!d(string=hai) anos
pai
achega
82c10e921e

+ 0 - 326
.idea/free-mybatis-generator-config.xml

@@ -1,326 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="PersistentConfig">
-    <option name="historyConfigList">
-      <map>
-        <entry key="admin">
-          <value>
-            <Config>
-              <option name="comment" value="true" />
-              <option name="daoMvnPath" value="src/main/java" />
-              <option name="daoName" value="AdminMapper" />
-              <option name="daoPackage" value="com.goafanti.common.dao" />
-              <option name="daoPostfix" value="Mapper" />
-              <option name="modelMvnPath" value="src/main/java" />
-              <option name="modelName" value="Admin" />
-              <option name="modelPackage" value="com.goafanti.common.model" />
-              <option name="name" value="admin" />
-              <option name="overrideJava" value="true" />
-              <option name="overrideXML" value="true" />
-              <option name="primaryKey" value="" />
-              <option name="projectFolder" value="$PROJECT_DIR$" />
-              <option name="tableName" value="admin" />
-              <option name="useSchemaPrefix" value="true" />
-              <option name="xmlMvnPath" value="src/main/java" />
-              <option name="xmlPackage" value="com.goafanti.common.mapper" />
-            </Config>
-          </value>
-        </entry>
-        <entry key="business_project">
-          <value>
-            <Config>
-              <option name="comment" value="true" />
-              <option name="daoMvnPath" value="src/main/java" />
-              <option name="daoName" value="BusinessProjectMapper" />
-              <option name="daoPackage" value="com.goafanti.common.dao" />
-              <option name="daoPostfix" value="Mapper" />
-              <option name="modelMvnPath" value="src/main/java" />
-              <option name="modelName" value="BusinessProject" />
-              <option name="modelPackage" value="com.goafanti.common.model" />
-              <option name="name" value="business_project" />
-              <option name="needToStringHashcodeEquals" value="true" />
-              <option name="overrideJava" value="true" />
-              <option name="overrideXML" value="true" />
-              <option name="primaryKey" value="" />
-              <option name="projectFolder" value="$PROJECT_DIR$" />
-              <option name="tableName" value="business_project" />
-              <option name="useSchemaPrefix" value="true" />
-              <option name="xmlMvnPath" value="src/main/java" />
-              <option name="xmlPackage" value="com.goafanti.common.mapper" />
-            </Config>
-          </value>
-        </entry>
-        <entry key="organization_identity">
-          <value>
-            <Config>
-              <option name="comment" value="true" />
-              <option name="daoMvnPath" value="src/main/java" />
-              <option name="daoName" value="OrganizationIdentityMapper" />
-              <option name="daoPackage" value="com.goafanti.common.dao" />
-              <option name="daoPostfix" value="Mapper" />
-              <option name="modelMvnPath" value="src/main/java" />
-              <option name="modelName" value="OrganizationIdentity" />
-              <option name="modelPackage" value="com.goafanti.common.model" />
-              <option name="name" value="organization_identity" />
-              <option name="overrideJava" value="true" />
-              <option name="overrideXML" value="true" />
-              <option name="primaryKey" value="" />
-              <option name="projectFolder" value="$PROJECT_DIR$" />
-              <option name="tableName" value="organization_identity" />
-              <option name="useSchemaPrefix" value="true" />
-              <option name="xmlMvnPath" value="src/main/java" />
-              <option name="xmlPackage" value="com.goafanti.common.mapper" />
-            </Config>
-          </value>
-        </entry>
-        <entry key="public_release">
-          <value>
-            <Config>
-              <option name="comment" value="true" />
-              <option name="daoMvnPath" value="src/main/java" />
-              <option name="daoName" value="PublicReleaseMapper" />
-              <option name="daoPackage" value="com.goafanti.common.dao" />
-              <option name="daoPostfix" value="Mapper" />
-              <option name="modelMvnPath" value="src/main/java" />
-              <option name="modelName" value="PublicRelease" />
-              <option name="modelPackage" value="com.goafanti.common.model" />
-              <option name="name" value="public_release" />
-              <option name="overrideJava" value="true" />
-              <option name="overrideXML" value="true" />
-              <option name="primaryKey" value="id" />
-              <option name="projectFolder" value="$PROJECT_DIR$" />
-              <option name="tableName" value="public_release" />
-              <option name="useSchemaPrefix" value="true" />
-              <option name="xmlMvnPath" value="src/main/java" />
-              <option name="xmlPackage" value="com.goafanti.common.mapper" />
-            </Config>
-          </value>
-        </entry>
-        <entry key="public_release_count">
-          <value>
-            <Config>
-              <option name="comment" value="true" />
-              <option name="daoMvnPath" value="src/main/java" />
-              <option name="daoName" value="PublicReleaseCountMapper" />
-              <option name="daoPackage" value="com.goafanti.common.dao" />
-              <option name="daoPostfix" value="Mapper" />
-              <option name="modelMvnPath" value="src/main/java" />
-              <option name="modelName" value="PublicReleaseCount" />
-              <option name="modelPackage" value="com.goafanti.common.model" />
-              <option name="name" value="public_release_count" />
-              <option name="overrideJava" value="true" />
-              <option name="overrideXML" value="true" />
-              <option name="primaryKey" value="" />
-              <option name="projectFolder" value="$PROJECT_DIR$" />
-              <option name="tableName" value="public_release_count" />
-              <option name="useSchemaPrefix" value="true" />
-              <option name="xmlMvnPath" value="src/main/java" />
-              <option name="xmlPackage" value="com.goafanti.common.mapper" />
-            </Config>
-          </value>
-        </entry>
-        <entry key="t_dun_log">
-          <value>
-            <Config>
-              <option name="comment" value="true" />
-              <option name="daoMvnPath" value="src/main/java" />
-              <option name="daoName" value="TDunLogMapper" />
-              <option name="daoPackage" value="com.goafanti.common.dao" />
-              <option name="daoPostfix" value="Mapper" />
-              <option name="modelMvnPath" value="src/main/java" />
-              <option name="modelName" value="TDunLog" />
-              <option name="modelPackage" value="com.goafanti.common.model" />
-              <option name="name" value="t_dun_log" />
-              <option name="needToStringHashcodeEquals" value="true" />
-              <option name="overrideJava" value="true" />
-              <option name="overrideXML" value="true" />
-              <option name="primaryKey" value="" />
-              <option name="projectFolder" value="$PROJECT_DIR$" />
-              <option name="tableName" value="t_dun_log" />
-              <option name="xmlMvnPath" value="src/main/java" />
-              <option name="xmlPackage" value="com.goafanti.common.mapper" />
-            </Config>
-          </value>
-        </entry>
-        <entry key="t_order_legal_affairs">
-          <value>
-            <Config>
-              <option name="comment" value="true" />
-              <option name="daoMvnPath" value="src/main/java" />
-              <option name="daoName" value="TOrderLegalAffairsMapper" />
-              <option name="daoPackage" value="com.goafanti.common.dao" />
-              <option name="daoPostfix" value="Mapper" />
-              <option name="modelMvnPath" value="src/main/java" />
-              <option name="modelName" value="TOrderLegalAffairs" />
-              <option name="modelPackage" value="com.goafanti.common.model" />
-              <option name="name" value="t_order_legal_affairs" />
-              <option name="needToStringHashcodeEquals" value="true" />
-              <option name="overrideJava" value="true" />
-              <option name="overrideXML" value="true" />
-              <option name="primaryKey" value="id" />
-              <option name="projectFolder" value="$PROJECT_DIR$" />
-              <option name="tableName" value="t_order_legal_affairs" />
-              <option name="xmlMvnPath" value="src/main/java" />
-              <option name="xmlPackage" value="com.goafanti.common.mapper" />
-            </Config>
-          </value>
-        </entry>
-        <entry key="t_order_mid">
-          <value>
-            <Config>
-              <option name="comment" value="true" />
-              <option name="daoMvnPath" value="src/main/java" />
-              <option name="daoName" value="TOrderMidMapper" />
-              <option name="daoPackage" value="com.goafanti.common.dao" />
-              <option name="daoPostfix" value="Mapper" />
-              <option name="modelMvnPath" value="src/main/java" />
-              <option name="modelName" value="TOrderMid" />
-              <option name="modelPackage" value="com.goafanti.common.model" />
-              <option name="name" value="t_order_mid" />
-              <option name="needToStringHashcodeEquals" value="true" />
-              <option name="overrideJava" value="true" />
-              <option name="overrideXML" value="true" />
-              <option name="primaryKey" value="id" />
-              <option name="projectFolder" value="$PROJECT_DIR$" />
-              <option name="tableName" value="t_order_mid" />
-              <option name="useSchemaPrefix" value="true" />
-              <option name="xmlMvnPath" value="src/main/java" />
-              <option name="xmlPackage" value="com.goafanti.common.mapper" />
-            </Config>
-          </value>
-        </entry>
-        <entry key="t_order_task">
-          <value>
-            <Config>
-              <option name="comment" value="true" />
-              <option name="daoMvnPath" value="src/main/java" />
-              <option name="daoName" value="TOrderTaskMapper" />
-              <option name="daoPackage" value="com.goafanti.common.dao" />
-              <option name="daoPostfix" value="Mapper" />
-              <option name="modelMvnPath" value="src/main/java" />
-              <option name="modelName" value="TOrderTask" />
-              <option name="modelPackage" value="com.goafanti.common.model" />
-              <option name="name" value="t_order_task" />
-              <option name="needToStringHashcodeEquals" value="true" />
-              <option name="overrideJava" value="true" />
-              <option name="overrideXML" value="true" />
-              <option name="primaryKey" value="id" />
-              <option name="projectFolder" value="$PROJECT_DIR$" />
-              <option name="tableName" value="t_order_task" />
-              <option name="xmlMvnPath" value="src/main/java" />
-              <option name="xmlPackage" value="com.goafanti.common.mapper" />
-            </Config>
-          </value>
-        </entry>
-        <entry key="t_task_mid">
-          <value>
-            <Config>
-              <option name="comment" value="true" />
-              <option name="daoMvnPath" value="src/main/java" />
-              <option name="daoName" value="TTaskMidMapper" />
-              <option name="daoPackage" value="com.goafanti.common.dao" />
-              <option name="daoPostfix" value="Mapper" />
-              <option name="modelMvnPath" value="src/main/java" />
-              <option name="modelName" value="TTaskMid" />
-              <option name="modelPackage" value="com.goafanti.common.model" />
-              <option name="name" value="t_task_mid" />
-              <option name="overrideJava" value="true" />
-              <option name="overrideXML" value="true" />
-              <option name="primaryKey" value="" />
-              <option name="projectFolder" value="$PROJECT_DIR$" />
-              <option name="tableName" value="t_task_mid" />
-              <option name="useSchemaPrefix" value="true" />
-              <option name="xmlMvnPath" value="src/main/java" />
-              <option name="xmlPackage" value="com.goafanti.common.mapper" />
-            </Config>
-          </value>
-        </entry>
-        <entry key="user_data">
-          <value>
-            <Config>
-              <option name="comment" value="true" />
-              <option name="daoMvnPath" value="src/main/java" />
-              <option name="daoName" value="UserDataMapper" />
-              <option name="daoPackage" value="com.goafanti.common.dao" />
-              <option name="daoPostfix" value="Mapper" />
-              <option name="modelMvnPath" value="src/main/java" />
-              <option name="modelName" value="UserData" />
-              <option name="modelPackage" value="com.goafanti.common.model" />
-              <option name="name" value="user_data" />
-              <option name="overrideJava" value="true" />
-              <option name="overrideXML" value="true" />
-              <option name="primaryKey" value="id" />
-              <option name="projectFolder" value="$PROJECT_DIR$" />
-              <option name="tableName" value="user_data" />
-              <option name="useSchemaPrefix" value="true" />
-              <option name="xmlMvnPath" value="src/main/resources" />
-              <option name="xmlPackage" value="com.goafanti.common.mapper" />
-            </Config>
-          </value>
-        </entry>
-        <entry key="user_data_log">
-          <value>
-            <Config>
-              <option name="comment" value="true" />
-              <option name="daoMvnPath" value="src/main/java" />
-              <option name="daoName" value="UserDataLogMapper" />
-              <option name="daoPackage" value="com.goafanti.common.dao" />
-              <option name="daoPostfix" value="Mapper" />
-              <option name="modelMvnPath" value="src/main/java" />
-              <option name="modelName" value="UserDataLog" />
-              <option name="modelPackage" value="com.goafanti.common.model" />
-              <option name="name" value="user_data_log" />
-              <option name="primaryKey" value="id" />
-              <option name="projectFolder" value="$PROJECT_DIR$" />
-              <option name="tableName" value="user_data_log" />
-              <option name="useSchemaPrefix" value="true" />
-              <option name="xmlMvnPath" value="src/main/java" />
-              <option name="xmlPackage" value="com.goafanti.common.mapper" />
-            </Config>
-          </value>
-        </entry>
-        <entry key="user_mid">
-          <value>
-            <Config>
-              <option name="comment" value="true" />
-              <option name="daoMvnPath" value="src/main/java" />
-              <option name="daoName" value="UserMidMapper" />
-              <option name="daoPackage" value="com.goafanti.common.dao" />
-              <option name="daoPostfix" value="Mapper" />
-              <option name="modelMvnPath" value="src/main/java" />
-              <option name="modelName" value="UserMid" />
-              <option name="modelPackage" value="com.goafanti.common.model" />
-              <option name="name" value="user_mid" />
-              <option name="primaryKey" value="id" />
-              <option name="projectFolder" value="$PROJECT_DIR$" />
-              <option name="tableName" value="user_mid" />
-              <option name="useSchemaPrefix" value="true" />
-              <option name="xmlMvnPath" value="src/main/resources" />
-              <option name="xmlPackage" value="com.goafanti.common.mapper" />
-            </Config>
-          </value>
-        </entry>
-      </map>
-    </option>
-    <option name="initConfig">
-      <map>
-        <entry key="initConfig">
-          <value>
-            <Config>
-              <option name="comment" value="true" />
-              <option name="daoPackage" value="com.goafanti.common.dao" />
-              <option name="daoPostfix" value="Mapper" />
-              <option name="modelPackage" value="com.goafanti.common.model" />
-              <option name="name" value="initConfig" />
-              <option name="needToStringHashcodeEquals" value="true" />
-              <option name="overrideJava" value="true" />
-              <option name="overrideXML" value="true" />
-              <option name="projectFolder" value="$PROJECT_DIR$" />
-              <option name="xmlPackage" value="com.goafanti.common.mapper" />
-            </Config>
-          </value>
-        </entry>
-      </map>
-    </option>
-  </component>
-</project>

+ 14 - 1
src/main/java/com/goafanti/admin/bo/AdminListBo.java

@@ -98,7 +98,20 @@ public class AdminListBo {
 	private String contactId;
 	
 	private String openId;
-	
+
+	/**
+	 * 审核人
+	 */
+	private String reviewer;
+
+	public String getReviewer() {
+		return reviewer;
+	}
+
+	public void setReviewer(String reviewer) {
+		this.reviewer = reviewer;
+	}
+
 	public List<String> getRolesId() {
 		return rolesId;
 	}

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

@@ -765,8 +765,8 @@
   </select>
   <!-- 获得当前登录人的名字和部门名 -->
   <select id="getDeptNameByAid" parameterType="java.lang.String" resultType="com.goafanti.admin.bo.AdminListBo">
-    select a.id,a.name, d.name as departmentName,a.department_id departmentId,a.email,a.superior_id superiorId,a.open_id openId
-    from admin a left join department d on a.department_id = d.id
+    select a.id,a.name, d.name as departmentName,a.department_id departmentId,a.email,a.superior_id superiorId,a.open_id openId,
+    a.reviewer from admin a left join department d on a.department_id = d.id
     where a.id = #{_parameter,jdbcType=VARCHAR}
   </select>
 

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

@@ -92,7 +92,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		}
 		publicReleaseMapper.insertSelectiveGetId(in);
 		AdminListBo my = adminMapper.getDeptNameByAid(TokenManager.getAdminId());
-		Admin a=adminMapper.selectByPrimaryKey(my.getSuperiorId());
+		Admin a=adminMapper.selectByPrimaryKey(my.getReviewer());
 		PublicReleaseLog log=new PublicReleaseLog(in.getId(),TokenManager.getAdminId(),1,"发起外出申请",new Date());
 		publicReleaseLogMapper.insertSelective(log);
 		String openid=a.getOpenId();