Merge branch 'master' of http://8.137.121.180:10880/longping/subject_gxj

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/account/po/CommLogin.hbm.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="com.rtrh.projects.modules.account.po">
+    <class name="CommLogin" table="comm_login">
+        <id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
+        <property column="loginname" name="loginname" not-null="false" type="java.lang.String" />
+        <property column="ip" name="ip" not-null="false" type="java.lang.String" />
+        <property column="city" name="city" not-null="false" type="java.lang.String" />
+        <property column="ua" name="ua" not-null="false" type="java.lang.String" />
+        <property column="status" name="status" not-null="false" type="java.lang.Boolean" />
+        <property column="remark" name="remark" not-null="false" type="java.lang.String" />
+        <property column="create_time" name="createTime" not-null="false" type="java.util.Date" />
+    </class>
+</hibernate-mapping>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/account/po/CommUser.hbm.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="com.rtrh.projects.modules.account.po">
+    <class name="CommUser" table="comm_user">
+        <id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
+        <property column="login_name" name="loginname" not-null="false" type="java.lang.String" />
+        <property column="password" name="password" not-null="false" type="java.lang.String" />
+        <property column="salt" name="salt" not-null="false" type="java.lang.String" />
+        <property column="enabled" name="enabled" not-null="false" type="java.lang.Integer" />
+        <property column="locked" name="locked" not-null="false" type="java.lang.Integer" />
+        <property column="create_time" name="createTime" not-null="false" type="java.util.Date" />
+        <property column="update_time" name="updateTime" not-null="false" type="java.util.Date" />
+       <!--  <property column="password_change_time" name="passwordChangeTime" not-null="false" type="java.util.Date" /> -->
+    </class>
+</hibernate-mapping>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/email/po/EmailSendRecord.hbm.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="com.rtrh.projects.modules.email.po">
+	<class name="EmailSendRecord" table="email_send_record">
+		<id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
+		<property column="email" name="email" not-null="false" type="java.lang.String" />
+		<property column="send_time" name="sendTime" not-null="false" type="java.util.Date" />
+		<property column="send_success" name="sendSuccess" not-null="false" type="java.lang.Boolean" />
+		<property column="code" name="code" not-null="false" type="java.lang.String" />
+        <property column="verfiy" name="verfiy" not-null="false" type="java.lang.Boolean" />
+        <property column="end_time" name="endTime" not-null="false" type="java.util.Date" />
+	</class>
+</hibernate-mapping>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/intermediatry/po/Intermediatry.hbm.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="com.rtrh.projects.modules.intermediatry.po">
+    <class name="Intermediatry" table="intermediatry_service">
+        <id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
+        <property column="type" name="type" not-null="false" type="java.lang.String" />
+        <property column="title" name="title" not-null="false" type="java.lang.String" />
+        <property column="group_code" name="groupCode" not-null="false" type="java.lang.String" />
+        <property column="addr" name="addr" not-null="false" type="java.lang.String" />
+        <property column="legal_name" name="legalName" not-null="false" type="java.lang.String" />
+        <property column="legal_phone" name="legalPhone" not-null="false" type="java.lang.String" />
+        <property column="business_owner" name="businessOwner" not-null="false" type="java.lang.String" />
+        <property column="business_job" name="businessJob" not-null="false" type="java.lang.String" />
+        <property column="business_phone" name="businessPhone" not-null="false" type="java.lang.String" />
+        <property column="create_user_name" name="createUserName" not-null="false" type="java.lang.String" />
+        <property column="zxjb" name="zxjb" not-null="false" type="java.lang.String" />
+        <property column="zx_time" name="zxTime" not-null="false" type="java.util.Date" />
+        <property column="zx_time1" name="zxTime1" not-null="false" type="java.util.Date" />
+        <property column="zx_no" name="zxNo" not-null="false" type="java.lang.String" />
+        <property name="mainBusiness" type="java.lang.String">
+            <column name="main_business" not-null="false" sql-type="text"/>
+        </property>
+        <property column="remark" name="remark" not-null="false" type="java.lang.String" />
+        <property column="create_time" name="createTime" not-null="false" type="java.util.Date" />
+        <property column="create_user" name="createUser" not-null="false" type="java.lang.String" />
+        <property column="update_time" name="updateTime" not-null="false" type="java.util.Date" />
+        <property column="update_user" name="updateUser" not-null="false" type="java.lang.String" />
+        <property column="status" name="status" not-null="false" type="java.lang.String" />
+        <property column="reason" name="reason" not-null="false" type="java.lang.String" />
+        <property column="logic_delete_flag" name="logicDeleteFlag" not-null="false" type="java.lang.Integer" />
+    </class>
+
+</hibernate-mapping>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/intermediatry/po/IntermediatryFile.hbm.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="com.rtrh.projects.modules.intermediatry.po">
+    <class name="IntermediatryFile" table="intermediatry_service_file">
+        <id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
+        <property column="inter_id" name="interId" not-null="false" type="java.lang.String" />
+        <property column="file_id" name="fileId" not-null="false" type="java.lang.String" />
+        <property column="file_type" name="fileType" not-null="false" type="java.lang.String" />
+        <property column="file_name" name="fileName" not-null="false" type="java.lang.String" />
+        <property column="create_time" name="createTime" not-null="false" type="java.util.Date" />
+        <property column="logic_delete_flag" name="logicDeleteFlag" not-null="false" type="java.lang.Integer" />
+    </class>
+</hibernate-mapping>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/message/po/MessageConsume.hbm.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="com.rtrh.projects.modules.message.po">
+	<class name="MessageConsume" table="mse_consume">
+		<id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
+		<property column="mesinfo_id" name="msgInfoId" not-null="false" type="java.lang.String" />
+		<property column="user_id" name="userId" not-null="false" type="java.lang.String" />
+		<property column="user_name" name="userName" not-null="false" type="java.lang.String" />
+        <property column="status" name="status" not-null="false" type="java.lang.String" />
+        <property column="logic_delete_flag" name="logicDeleteFlag" not-null="false" type="java.lang.Integer" />
+		<property column="date_read" name="dateRead" not-null="false" type="java.util.Date" />
+	</class>
+</hibernate-mapping>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/message/po/MessageInfo.hbm.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="com.rtrh.projects.modules.message.po">
+	<class name="MessageInfo" table="mse_info">
+		<id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
+		<property column="user_id" name="userId" not-null="false" type="java.lang.String" />
+		<property column="user_name" name="userName" not-null="false" type="java.lang.String" />
+        <property column="content" name="content" not-null="false" type="java.lang.String" />
+        <property column="logic_delete_flag" name="logicDeleteFlag" not-null="false" type="java.lang.Integer" />
+		<property column="create_user_id" name="createUserId" not-null="false" type="java.lang.String" />
+		<property column="create_time" name="createTime" not-null="false" type="java.util.Date" />
+	</class>
+</hibernate-mapping>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/msglog/po/PhoneMsgLog.hbm.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="com.rtrh.projects.modules.msglog.po">
+	<class name="PhoneMsgLog" table="phone_msg_log">
+		<id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
+		<property column="sub_id" name="subId" not-null="false" type="java.lang.String" />
+		<property column="msg_type" name="msgType" not-null="false" type="java.lang.String" />
+		<property column="user_name" name="userName" not-null="false" type="java.lang.String" />
+        <property column="content" name="content" not-null="false" type="java.lang.String" />
+        <property column="tel" name="tel" not-null="false" type="java.lang.String" />
+        <property column="kind" name="kind" not-null="false" type="java.lang.String" />
+        <property column="success" name="success" not-null="false" type="java.lang.Boolean" />
+        <property column="error_msg" name="errorMsg" not-null="false" type="java.lang.String" />
+        <property column="logic_delete_flag" name="logicDeleteFlag" not-null="false" type="java.lang.Integer" />
+		<property column="create_time" name="createTime" not-null="false" type="java.util.Date" />
+	</class>
+</hibernate-mapping>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/notice/po/NoticePO.hbm.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="com.rtrh.projects.modules.notice.po">
+	<class name="NoticePO" table="notice">
+		<id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
+		<property column="title" name="title" not-null="false" type="java.lang.String" />
+		<property column="begin_date" name="beginDate" not-null="false" type="java.util.Date" />
+		<property column="end_date" name="endDate" not-null="false" type="java.util.Date" />
+		<property column="publish" name="publish" not-null="false" type="java.lang.Boolean" />
+		<property column="publish_date" name="publishDate" not-null="false" type="java.util.Date" />
+		<property name="content" type="java.lang.String">
+			<column name="content" not-null="false" sql-type="text"/>
+		</property>
+       <property column="create_time" name="createTime" not-null="false" type="java.util.Date" />
+        <property column="create_user_id" name="createUserId" not-null="false" type="java.lang.String" />
+        <property column="last_update_user_id" name="lastUpdateUserId" not-null="false" type="java.lang.String" />
+        <property column="last_update_time" name="lastUpdateTime" not-null="false" type="java.util.Date" />
+        <property column="logic_delete_flag" name="logicDeleteFlag" not-null="false" type="java.lang.Integer" />
+	</class>
+</hibernate-mapping>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/policy/po/PolicyDocumentColumn.hbm.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="com.rtrh.projects.modules.policy.po">
+	<class name="PolicyDocumentColumn" table="policy_document_column">
+		<id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
+		<property column="title" name="title" not-null="false" type="java.lang.String" />
+		<property column="index_x" name="indexX" not-null="false" type="java.lang.Integer" />
+		<property column="enable" name="enable" not-null="false" type="java.lang.Boolean" />
+		<property column="need_cover" name="needCover" not-null="false" type="java.lang.Boolean" />
+        <property column="create_time" name="createTime" not-null="false" type="java.util.Date" />
+        <property column="create_user_id" name="createUserId" not-null="false" type="java.lang.String" />
+        <property column="last_update_user_id" name="lastUpdateUserId" not-null="false" type="java.lang.String" />
+        <property column="last_update_time" name="lastUpdateTime" not-null="false" type="java.util.Date" />
+        <property column="logic_delete_flag" name="logicDeleteFlag" not-null="false" type="java.lang.Integer" />
+	</class>
+</hibernate-mapping>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/policy/po/PolicyDocumentPO.hbm.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="com.rtrh.projects.modules.policy.po">
+	<class name="PolicyDocumentPO" table="policy_document">
+		<id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
+		<property column="rpt_date" name="rptDate" not-null="false" type="java.util.Date" />
+		<property column="cover_img" name="coverImg" not-null="false" type="java.lang.String" />
+		<property column="title" name="title" not-null="false" type="java.lang.String" />
+		<property column="title_sub" name="titleSub" not-null="false" type="java.lang.String" />
+		<property column="column_id" name="columnId" not-null="false" type="java.lang.String" />
+		<property column="index_x" name="indexX" not-null="false" type="java.lang.Integer" />
+		<property name="content" type="java.lang.String">
+			<column name="content" not-null="false" sql-type="text"/>
+		</property>
+		<property column="show_app" name="showApp" not-null="false" type="java.lang.Boolean" />
+		<property column="publish_status" name="publishStatus" not-null="false" type="java.lang.Boolean" />
+		<property column="publish_date" name="publishDate" not-null="false" type="java.util.Date" />
+        <property column="create_time" name="createTime" not-null="false" type="java.util.Date" />
+        <property column="create_user_id" name="createUserId" not-null="false" type="java.lang.String" />
+        <property column="last_update_user_id" name="lastUpdateUserId" not-null="false" type="java.lang.String" />
+        <property column="last_update_time" name="lastUpdateTime" not-null="false" type="java.util.Date" />
+        <property column="logic_delete_flag" name="logicDeleteFlag" not-null="false" type="java.lang.Integer" />
+	</class>
+</hibernate-mapping>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/problem/mapper/SubquestionInfoMapper.xml

@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.rtrh.projects.modules.problem.mapper.SubquestionInfoMapper">
+
+    <select id="pageQueryQuestionNewList" parameterType="map" resultType="map">
+
+        SELECT IF
+                   (us.id IS NULL, 0, 1) AS   usersub,
+               IF
+                   (a.status_fgw = '2', 1, 0) redNum,
+               IF
+                   (a.status_fgw = '1', 1, 0) yellowNum,
+               a.close_reason,
+               a.STATUS                  AS   stu,
+               a.file_type               AS   fileType,
+               b.sub_name,
+               b.main_id,
+               a.sub_id,
+               a.date_apply,
+               b.STATUS,
+               a.id,
+               a.title,
+               c.title                   AS   kind_sourceid,
+               d.title                   AS   kind_typeid,
+               a.date_conf,
+               a.file_addre
+        FROM sub_q_info a
+                 LEFT JOIN sub_info b ON a.sub_id = b.id
+                 LEFT JOIN t_systable c ON a.kind_sourceid = c.id
+                 LEFT JOIN t_systable d ON a.kind_typeid = d.id
+                 LEFT JOIN sub_source g ON g.sub_id = b.id
+            AND g.logic_delete_flag = 0
+                 LEFT JOIN sub_manage e ON b.id = e.sub_id
+            AND e.logic_delete_flag = 0
+                 LEFT JOIN sub_verify f ON f.sub_id = a.sub_id
+            AND f.logic_delete_flag = 0
+                 LEFT JOIN sec_user_sub us ON b.id = us.sub_id
+            AND us.logic_delete_flag = 0
+            AND us.user_id = #{userId}
+        <where>
+            a.logic_delete_flag = 0
+            and b.indus_kind in('210','99','2')
+            <if test="subjectName != null and subjectName != ''">
+                AND b.sub_name LIKE CONCAT('%', #{subjectName}, '%')
+            </if>
+            <if test="propKind != null and propKind != ''">
+                AND b.prop_kind IN (${propKind})
+            </if>
+            <if test="startDate != null and startDate != ''">
+                AND  date_format(a.date_conf,'%Y-%m-%d') >= #{startDate}
+            </if>
+            <if test="endDate != null and endDate != ''">
+                AND  date_format(a.date_conf,'%Y-%m-%d') &lt;= #{endDate}
+            </if>
+            <if test="status != null and status != ''">
+                AND a.`status` = #{status}
+            </if>
+            <if test="closeReason != null and closeReason != ''">
+                AND a.close_reason = #{closeReason}
+            </if>
+            <if test="subjectId != null and subjectId != ''">
+                AND b.subject_id = #{subjectId}
+            </if>
+            <if test="indusKind != null and indusKind != ''">
+                AND b.indus_kind = #{indusKind}
+            </if>
+        </where>
+        GROUP BY a.id
+        ORDER BY usersub DESC, date_conf DESC
+
+    </select>
+</mapper>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/problem/po/SubQuestionFile.hbm.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="com.rtrh.projects.modules.problem.po">
+    <class name="SubQuestionFile" table="sub_question_file">
+        <id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
+        <property column="problem_id" name="problemId" not-null="false" type="java.lang.String" />
+        <property column="type" name="type" not-null="false" type="java.lang.String" />
+        <property column="file_id" name="fileId" not-null="false" type="java.lang.String" />
+        <property column="file_type" name="fileType" not-null="false" type="java.lang.String" />
+        <property column="file_name" name="fileName" not-null="false" type="java.lang.String" />
+        <property column="create_time" name="createTime" not-null="false" type="java.util.Date" />
+        <property column="logic_delete_flag" name="logicDeleteFlag" not-null="false" type="java.lang.Integer" />
+    </class>
+</hibernate-mapping>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/problem/po/SubquestionComsum.hbm.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="com.rtrh.projects.modules.problem.po">
+	<class name="SubquestionConsum" table="sub_q_consume">
+		<id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
+        <property column="sub_id" name="sub_id" not-null="false" type="java.lang.String" />
+        <property column="sub_q_id" name="sub_q_id" not-null="false" type="java.lang.String" />
+        <property column="rpt_date" name="rpt_date" not-null="false" type="java.util.Date" />
+        <property column="name_hand" name="name_hand" not-null="false" type="java.lang.String" />
+        <property column="title" name="title" not-null="false" type="java.lang.String" />
+        <property column="create_time" name="createTime" not-null="false" type="java.util.Date" />
+        <property column="create_user_id" name="createUserId" not-null="false" type="java.lang.String" />
+        <property column="last_update_user_id" name="lastUpdateUserId" not-null="false" type="java.lang.String" />
+        <property column="last_update_time" name="lastUpdateTime" not-null="false" type="java.util.Date" />
+        <property column="logic_delete_flag" name="logicDeleteFlag" not-null="false" type="java.lang.Integer" />
+	</class>
+</hibernate-mapping>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/problem/po/SubquestionInfo.hbm.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="com.rtrh.projects.modules.problem.po">
+	<class name="SubquestionInfo" table="sub_q_info">
+		<id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
+        <property column="sub_id" name="sub_id" not-null="false" type="java.lang.String" />
+        <property column="kind" name="kind" not-null="false" type="java.lang.String" />
+        <property column="kind_sourceid" name="kind_sourceid" not-null="false" type="java.lang.String" />
+        <property column="kind_typeid" name="kind_typeid" not-null="false" type="java.lang.String" />
+        <property column="title" name="title" not-null="false" type="java.lang.String" />
+        <property column="status" name="status" not-null="false" type="java.lang.String" />
+            <property column="date_conf" name="date_conf" not-null="false" type="java.util.Date" />
+             <property column="name_apply" name="name_apply" not-null="false" type="java.lang.String" />
+            <property column="date_apply" name="date_apply" not-null="false" type="java.util.Date" />
+            <property column="file_name" name="file_name" not-null="false" type="java.lang.String" />
+        <property column="status_fgw" name="status_fgw" not-null="false" type="java.lang.String" />
+        <property column="close_reason" name="closeReason" not-null="false" type="java.lang.String" />
+        <property column="file_addre" name="file_addre" not-null="false" type="java.lang.String" />
+        <property column="unit_id" name="unit_id" not-null="false" type="java.lang.String"  />
+        <property column="name_lead" name="name_lead" not-null="false" type="java.lang.String" />
+        <property column="name_lxr" name="name_lxr" not-null="false" type="java.lang.String" />
+        <property column="tel" name="tel" not-null="false" type="java.lang.String" />
+        <property column="file_type" name="fileType" not-null="false" type="java.lang.String" />
+
+            <property column="comple_date" name="compleDate" not-null="false" type="java.util.Date" />
+            <property column="comple_desc" name="compleDesc" not-null="false" type="java.lang.String" />
+
+        <property column="create_time" name="createTime" not-null="false" type="java.util.Date" />
+        <property column="create_user_id" name="createUserId" not-null="false" type="java.lang.String" />
+        <property column="last_update_user_id" name="lastUpdateUserId" not-null="false" type="java.lang.String" />
+        <property column="last_update_time" name="lastUpdateTime" not-null="false" type="java.util.Date" />
+        <property column="logic_delete_flag" name="logicDeleteFlag" not-null="false" type="java.lang.Integer" />
+	</class>
+</hibernate-mapping>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/projects/mapper/LogOperateMapper.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.rtrh.projects.modules.projects.mapper.LogOperateMapper">
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, userid, username, menu, button, title, kind, sub_id, status_first, status_after, zh_date, remark, create_user_id, create_user_name, create_time, logic_delete_flag
+    </sql>
+    <insert id="save">
+        insert into t_log_operate
+            (create_time,create_user_id,create_user_name,status_after,status_first,kind,sub_id,zh_date,logic_delete_flag,title)
+            values (now(),
+                   #{log.createUserId},
+                   #{log.createUserName},
+                   #{log.statusAfter},
+                   #{log.statusFirst},
+                   #{log.kind},
+                   #{log.subId},
+                   now(),
+                    0,
+                    #{log.title}
+                    )
+    </insert>
+
+</mapper>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/projects/mapper/QOQMapper.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.rtrh.projects.modules.projects.mapper.QOQMapper" >
+
+
+    <select id="getList" resultType="java.util.Map" statementType="CALLABLE" useCache="false">
+        call total_thb_sub2(#{varkind},#{varxz}, #{varhy},#{varsubkind},#{varlogin})
+    </select>
+
+
+    <select id="getListZb" resultType="java.util.Map" statementType="CALLABLE" useCache="false">
+        call total_thb_zb2(#{varkind},#{varxz}, #{varhy},#{varsubkind},#{varlogin})
+    </select>
+</mapper>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/projects/mapper/QtMapper.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.rtrh.projects.modules.projects.mapper.QtMapper">
+
+    <select id="getQTData" statementType="CALLABLE" resultType="com.rtrh.projects.modules.projects.vo.QTVO">
+        {call dp_gxj_qt(
+                #{varlx, mode=IN, jdbcType=VARCHAR},
+                #{varyear, mode=IN, jdbcType=VARCHAR},
+                #{varqx, mode=IN, jdbcType=VARCHAR},
+                #{var4k, mode=IN, jdbcType=VARCHAR},
+                #{vargm, mode=IN, jdbcType=VARCHAR},
+                #{varhy, mode=IN, jdbcType=VARCHAR},
+                #{varlogin, mode=IN, jdbcType=VARCHAR}
+              )}
+    </select>
+
+</mapper>
+

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/projects/mapper/ReportMapper.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.rtrh.projects.modules.projects.mapper.ReportMapper" >
+
+
+    <select id="GDZC_JC" resultType="java.util.Map" statementType="CALLABLE" useCache="false">
+        call total_r_gdzc_1(#{kind},#{year},#{month},#{login})
+    </select>
+
+    <select id="GDZC_QX_TZ" resultType="java.util.Map" statementType="CALLABLE" useCache="false">
+        call total_r_gdzc_4_guding(#{kind},#{year},#{month},#{login})
+    </select>
+
+    <select id="GDZC_TZFX" resultType="java.util.Map" statementType="CALLABLE" useCache="false">
+        call total_r_gdzc_4_guding_2(#{kind},#{year},#{month},#{login})
+    </select>
+
+    <select id="GDZC_HY" resultType="java.util.Map" statementType="CALLABLE" useCache="false">
+        call total_r_gdzc_hangye(#{kind},#{year},#{month},#{login})
+    </select>
+
+    <select id="GDZC_QX" resultType="java.util.Map" statementType="CALLABLE" useCache="false">
+        call total_r_gdzc_quxian(#{kind},#{year},#{month},#{login})
+    </select>
+
+    <select id="GDZC_XZ" resultType="java.util.Map" statementType="CALLABLE" useCache="false">
+        call total_r_gdzc_xinzhi(#{kind},#{year},#{month},#{login})
+    </select>
+
+    <select id="GDZC_ZTZ" resultType="java.util.Map" statementType="CALLABLE" useCache="false">
+        call total_r_gdzc_zongtouzi(#{kind},#{year},#{month},#{login})
+    </select>
+
+</mapper>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/projects/mapper/StaticsMapper.xml

@@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.rtrh.projects.modules.projects.mapper.StaticsMapper" >
+
+	<!-- 分析大屏-项目所属行业 -->
+	<select id="HYFL" resultType="java.util.Map" statementType="CALLABLE" useCache="false">
+		call total_dp_hyfl_data(#{year}, #{type}, #{orderNum},#{kind},#{loginName},#{moneyType}, #{isZj}, #{jsdd}, #{minAmt}, #{maxAmt},#{beginMonth},#{endMonth}, #{hyfl}, #{zjly})
+	</select>
+
+	<!-- 分析大屏-其他 -->
+	<select id="OTHER" resultType="java.util.Map" statementType="CALLABLE" useCache="false">
+		call total_dp_qt_data(#{year}, #{type}, #{kind}, #{loginName}, #{isZj}, #{jsdd}, #{minAmt}, #{maxAmt},#{beginMonth},#{endMonth}, #{hyfl}, #{zjly})
+	</select>
+
+	<!-- 分析大屏-投资月度分析 -->
+	<select id="TZYD" resultType="java.util.Map" statementType="CALLABLE" useCache="false">
+		call total_dp_tzydfx_data(#{year},#{type}, #{kind}, #{loginName},#{isZj}, #{jsdd}, #{minAmt}, #{maxAmt},#{beginMonth},#{endMonth}, #{hyfl}, #{zjly})
+	</select>
+
+	<!-- 分析大屏-责任单位投资 -->
+	<select id="TZZR" resultType="java.util.Map" statementType="CALLABLE" useCache="false">
+		call total_dp_xmph_data(#{year}, #{type},#{num}, #{kind}, #{loginName},#{moneyType}, #{isZj}, #{jsdd}, #{minAmt}, #{maxAmt},#{beginMonth},#{endMonth}, #{hyfl}, #{zjly})
+	</select>
+
+	<!-- 分析大屏-行业性质投资 -->
+	<select id="TZHYXZ" resultType="java.util.Map" statementType="CALLABLE" useCache="false">
+		call total_dp_qt_xmxz_data(#{year}, #{type},#{kind}, #{loginName}, #{isZj}, #{jsdd}, #{minAmt}, #{maxAmt},#{beginMonth},#{endMonth}, #{hyfl}, #{zjly})
+	</select>
+
+	<!-- 分析大屏-所属行业 -->
+	<select id="TZHYFL" resultType="java.util.Map" statementType="CALLABLE" useCache="false">
+		call total_dp_hyfl_data(#{year}, #{type},#{num}, #{kind}, #{loginName},#{moneyType}, #{isZj}, #{jsdd}, #{minAmt}, #{maxAmt},#{beginMonth},#{endMonth}, #{hyfl}, #{zjly})
+	</select>
+
+	<!-- 分析大屏-项目排行 -->
+	<select id="XMPH" resultType="java.util.Map" statementType="CALLABLE" useCache="false">
+		call total_dp_xmph_data(#{year}, #{type},#{orderNum},#{kind},#{loginName},#{moneyType}, #{isZj}, #{jsdd}, #{minAmt}, #{maxAmt},#{beginMonth},#{endMonth}, #{hyfl}, #{zjly})
+	</select>
+
+	<!-- 大屏预期列表 -->
+	<select id="YQList" resultType="java.util.Map" statementType="CALLABLE" useCache="false">
+		call total_dp_get_yq_list(#{year}, #{type}, #{kind}, #{loginName}, #{isZj}, #{jsdd}, #{minAmt}, #{maxAmt},#{beginMonth},#{endMonth}, #{hyfl}, #{zjly})
+	</select>
+
+	<!-- 项目预测 -->
+	<select id="projectYc" resultType="java.util.Map" statementType="CALLABLE" useCache="false">
+		call tatal_prediction_1(#{subId}, #{yczq})
+	</select>
+
+	<!-- 全部预测 -->
+	<select id="allYc" resultType="java.util.Map" statementType="CALLABLE" useCache="false">
+		call tatal_prediction_2(#{yczq})
+	</select>
+
+	<!-- 预测排名 -->
+	<select id="tzpm" resultType="java.util.Map" statementType="CALLABLE" useCache="false">
+		call total_dp_ph_10(#{year}, #{type}, #{kind}, #{loginName}, #{isZj}, #{jsdd},#{beginMonth},#{endMonth}, #{hyfl}, #{activeType}, #{month}, #{sort}, #{zjly})
+	</select>
+
+	<!-- 同比分析 -->
+	<select id="tbfx" resultType="java.util.Map" statementType="CALLABLE" useCache="false">
+		call total_dp_tbfx(#{year},#{subjectId},#{hyfl},#{zjly},#{kind},#{propKind},#{yType},#{hide},#{mode},#{loginName},#{kindType})
+	</select>
+	<!-- 旧版本sub_info -->
+	<select id="historyLib"  statementType="CALLABLE" useCache="false">
+		call fun_get_subinfo_year(#{vo.year},#{vo.result,mode=OUT,jdbcType=VARCHAR})
+	</select>
+
+	<!-- 新分析大屏-所属行业 -->
+	<select id="newhyfl" resultType="java.util.Map" statementType="CALLABLE" useCache="false">
+		call total_dp_2new_hyfl_data(#{year},#{lx},#{num},#{kind},#{loginName},#{x},#{iszj},#{subjectId},#{amt1},#{amt2},#{beginMonth},#{endMonth},#{hyfl},#{zjly})
+	</select>
+
+
+
+	<!-- 新分析大屏-其他 -->
+	<select id="newqt" resultType="java.util.Map" statementType="CALLABLE" useCache="false">
+		call total_dp_2new_qt_data(#{year},#{lx},#{kind},#{loginName},#{iszj},#{subjectId},#{amt1},#{amt2},#{beginMonth},#{endMonth},#{hyfl},#{zjly})
+	</select>
+
+
+	<!-- 新分析大屏-投资信息 -->
+	<select id="newtouzlist" parameterType="com.rtrh.projects.modules.projects.vo.NewTouzVO"  resultType="java.util.Map" statementType="CALLABLE" useCache="false">
+		call total_dp_2new_touzlist(#{year},#{lx},#{kind},#{loginName},#{iszj},#{subjectId},#{amt1},#{amt2},#{beginMonth},#{endMonth},#{hyfl},#{zjly},#{isgt},#{newTouzVO.outyear_zb,mode=OUT,jdbcType=VARCHAR },#{newTouzVO.outyear_tb,mode=OUT,jdbcType=VARCHAR },#{newTouzVO.outyear_hb,mode=OUT,jdbcType=VARCHAR },#{newTouzVO.outyearamt_total,mode=OUT,jdbcType=VARCHAR },#{newTouzVO.outyearamt_1,mode=OUT,jdbcType=VARCHAR },#{newTouzVO.outyearamt_2,mode=OUT,jdbcType=VARCHAR },#{newTouzVO.outyearamt_rt,mode=OUT,jdbcType=VARCHAR })
+	</select>
+
+
+	<!-- 新分析大屏-投资月度分析 -->
+	<select id="newtzydfx" resultType="java.util.Map" statementType="CALLABLE" useCache="false">
+		call total_dp_2new_tzydfx_data(#{year},#{lx},#{kind},#{loginName},#{iszj},#{subjectId},#{amt1},#{amt2},#{beginMonth},#{endMonth},#{hyfl},#{zjly})
+	</select>
+
+	<!--  统计分析-投资分析 -->
+	<select id="tzTongji" resultType="java.util.Map" statementType="CALLABLE" useCache="false">
+		call total_tj_2new_touzi(#{key},#{subjectId},#{indusKind},#{propKind},#{kindNature},#{loginName},#{year},#{month},#{isgt})
+	</select>
+
+	<!-- 统计分析-按各个类型的投资占比  -->
+	<select id="tzKindTongji" resultType="java.util.Map" statementType="CALLABLE" useCache="false">
+		call total_tj_2new_kind_zb(#{key},#{subjectId},#{indusKind},#{propKind},#{kindNature},#{loginName},#{year},#{month}, #{queryType})
+	</select>
+
+	<select id="tzTongjiQt" resultType="java.util.Map" statementType="CALLABLE" useCache="false">
+		call total_tj_2new_qt(#{key},#{subjectId},#{indusKind},#{propKind},#{kindNature},#{loginName},#{year},#{month},#{isgt})
+	</select>
+
+	<select id="getTjfxData" resultType="com.rtrh.projects.modules.projects.vo.SubInfoTjfxDataVo">
+		SELECT
+		id,
+		status,
+		amt_total AS amtTotal,
+		subject_id AS subjectId,
+		indus_kind AS indusKind
+		FROM
+		sub_info a
+		WHERE
+		logic_delete_flag = 0
+
+		<if test="startMoney != null">
+			AND a.amt_total &gt;= #{startMoney}
+		</if>
+
+		<if test="endMoney != null">
+			AND a.amt_total &lt;= #{endMoney}
+		</if>
+
+		<if test="subjectIds != null and subjectIds.size() &gt; 0">
+			AND a.subject_id IN
+			<foreach collection="subjectIds" item="item" separator="," open="(" close=")">
+				#{item}
+			</foreach>
+		</if>
+
+		<if test="codeList != null and codeList.size() &gt; 0">
+			AND a.indus_kind IN
+			<foreach collection="codeList" item="item" separator="," open="(" close=")">
+				#{item}
+			</foreach>
+		</if>
+
+		<if test="propKinds != null and propKinds.size() &gt; 0">
+			AND a.status IN
+			<foreach collection="propKinds" item="item" separator="," open="(" close=")">
+				#{item}
+			</foreach>
+		</if>
+	</select>
+	<select id="getTjfxYearMoneyBySubIds" resultType="com.rtrh.projects.modules.projects.vo.SubInfoTjfxDataVo">
+		SELECT
+		sub_id AS id,
+		SUM(amt) AS amt
+		FROM
+		sub_amtplan
+		WHERE
+		logic_delete_flag = 0
+		AND sub_id IN
+		<foreach collection="idList" item="item" separator="," open="(" close=")">
+			#{item}
+		</foreach>
+		AND y_month like concat(#{year}, '%')
+		GROUP BY
+		sub_id
+	</select>
+    <select id="getXmzhtjData" resultType="com.rtrh.projects.modules.projects.vo.TLogOperateVo">
+		select
+			DATE_FORMAT(zh_date, '%Y-%m') AS projectDate,
+		    title as title,
+		    kind as kind,
+		    count(*) as number
+		from
+		    t_log_operate
+		where
+			logic_delete_flag = 0
+		<if test="vo.startDate != null and  vo.startDate != ''">
+			AND zh_date &gt;= #{vo.startDate}
+		</if>
+		<if test="vo.endDate != null and vo.endDate != ''">
+			AND zh_date &lt;= #{vo.endDate}
+		</if>
+		<if test="vo.status != null and vo.status != ''">
+			AND kind = #{vo.status}
+		</if>
+		<if test="vo.status = null">
+			AND kind != 0
+		</if>
+		group by
+			projectDate, kind, title
+		order by
+		    projectDate, kind, title
+	</select>
+
+    <select id="getXmzhtjDetailData" resultType="com.rtrh.projects.modules.projects.vo.TLogOperateVo">
+		select
+		    b.sub_name as subName,
+		    a.kind as kind,
+		    a.title as title,
+		    a.create_time as createTime,
+		    a.create_user_name as createUserName
+		from
+		t_log_operate a
+		left join sub_info b on a.sub_id = b.id
+		where
+		a.logic_delete_flag = 0
+		<if test="startDate != null and  startDate != ''">
+			AND a.zh_date &gt;= #{startDate}
+		</if>
+		<if test="endDate != null and endDate != ''">
+			AND a.zh_date &lt;= #{endDate}
+		</if>
+		<if test="kind != null and kind != ''">
+			AND a.kind = #{kind}
+		</if>
+		<if test="title != null and title != ''">
+			AND a.title = #{title}
+		</if>
+		<if test="title == null or title == ''">
+			AND a.title IS NULL
+		</if>
+		order by
+		a.create_time desc
+	</select>
+
+</mapper>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/projects/mapper/SubCameraMapper.xml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.rtrh.projects.modules.projects.mapper.SubCameraMapper" >
+
+
+    <select id="cameraTreeNew" resultType="com.rtrh.projects.modules.projects.vo.CameraTreeVO" parameterType="string">
+        SELECT
+        a.id,
+        a.sub_id subId,
+        a.title,
+        b.sub_name subName
+        FROM
+        sub_camera a
+        LEFT JOIN sub_info b ON a.sub_id = b.id
+        WHERE
+        a.logic_delete_flag = 0
+        AND b.logic_delete_flag = 0
+        AND a.title != 'HSIPC'
+        and b.indus_kind in('210','99','2')
+        <if test="subId != null and subId != ''">
+            AND a.sub_id = #{subId}
+        </if>
+    </select>
+
+    <select id="getListCameraBySubId" resultType="com.rtrh.projects.modules.projects.po.SubCamera" parameterType="string">
+        SELECT
+            id,
+            sub_id as subId ,
+            code ,
+            encode_device_code as encodeDeviceCode ,
+            title ,
+            longitude ,
+            latitude ,
+            remark ,
+            create_time as createTime ,
+            is_show  as isShow ,
+            create_user_id  as createUserId ,
+            last_update_userId as lastUpdateUserId ,
+            last_update_time as lastUpdateTime ,
+            logic_delete_flag as logicDeleteFlag
+        FROM
+            sub_camera
+        WHERE
+        logic_delete_flag = 0
+        <if test="subId != null and subId != ''">
+            AND sub_id = #{subId}
+        </if>
+    </select>
+
+</mapper>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/projects/mapper/SubInduMapper.xml

@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.rtrh.projects.modules.projects.mapper.SubInduMapper" >
+    <insert id="save">
+        insert into sub_indu(id,code,title,last_id,logic_delete_flag,last_update_time)
+        values(#{s.id},#{s.code},#{s.title},#{s.lastId},0,#{s.lastUpdateTime})
+    </insert>
+    <update id="updateById">
+        update sub_indu set title = #{s.title},last_id = #{s.lastId},code=#{s.code},last_update_time=#{s.lastUpdateTime} where id=#{s.id}
+    </update>
+
+    <select id="selectAll" resultType="com.rtrh.projects.modules.projects.po.SubIndu">
+        select
+            i.id,
+            i.code,
+            i.title,
+            i.last_id as lastId,
+            s.title as parentTitle
+        from sub_indu i left join sub_indu s on i.last_id = s.id where i.logic_delete_flag=0
+        <if test="vo!=null and vo.title!=null and vo.title!=''">
+           and i.title like CONCAT('',#{vo.title},'%')
+        </if>
+        ORDER BY i.last_update_time DESC
+    </select>
+    <select id="getById" resultType="com.rtrh.projects.modules.projects.po.SubIndu">
+        SELECT
+        i.id,
+            i.code,
+            i.title,
+            i.last_id as lastId,
+            i.create_user_id as createUserId,
+            i.create_time as createTime,
+            i.last_update_user_id as lastUpdateUserId,
+            i.last_update_time as lastUpdateTime,
+            i.logic_delete_flag as logicDeleteFlag,
+            s.title as parentTitle
+        from sub_indu i left join sub_indu s on i.last_id = s.id where i.logic_delete_flag=0 and i.id = #{id}
+    </select>
+    <select id="selectAllSubIndu" resultType="com.rtrh.projects.modules.projects.po.SubIndu">
+        SELECT
+            si.id AS id,
+            si.code AS code,
+            si.title AS title,
+            si.last_id AS lastId,
+            parent.title AS parentTitle
+        FROM
+            sub_indu si
+                LEFT JOIN
+            sub_indu parent
+            ON
+                si.last_id = parent.id
+        WHERE
+            si.logic_delete_flag = 0;
+    </select>
+    <select id="getChildrenCodesByCode" resultType="java.lang.String">
+        SELECT
+            b.code as code
+        FROM
+            sub_indu a left join  sub_indu b on a.id = b.last_id
+        WHERE
+            a.code = #{indusKinds}
+                AND a.logic_delete_flag = 0;
+    </select>
+    <select id="selectChildrenCodesByCode" resultType="java.lang.String">
+        SELECT
+            b.code as code
+        FROM
+            sub_indu a left join  sub_indu b on a.id = b.last_id
+        WHERE
+            a.code in
+            <foreach collection="indusKinds" item="indusKind" open="(" separator="," close=")">
+                #{indusKind}
+            </foreach>
+                AND a.logic_delete_flag = 0;
+    </select>
+</mapper>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/projects/mapper/SubInfoMapper.xml

@@ -0,0 +1,1228 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.rtrh.projects.modules.projects.mapper.SubInfoMapper" >
+    <insert id="batchInsertSubFix">
+        INSERT INTO sub_fix (id, sub_id, year, cat, create_time, create_user_id)
+        VALUES
+        <foreach collection="subFixList" item="item" separator=",">
+            (#{item.id}, #{item.subId}, #{item.year}, #{item.cat}, #{item.createTime}, #{item.createUserId})
+        </foreach>
+    </insert>
+
+
+    <select id="smartSiteQuery" resultType="com.rtrh.projects.modules.projects.vo.SubSmartVO"  >
+        SELECT
+        si.sub_name subName,
+        si.begin_date beginDate,
+        si.end_date endDate,
+        si.amt_total amtTotal,
+        si.amt_year amtYear,
+        src2.yearAmtSj,
+        si.name_zrr nameZrr,
+        si.name_lead nameLead,
+        si.abc,
+        si.status,
+        si.longitude,
+        si.latitude,
+        si.id,
+        (
+        SELECT
+        num_bl
+        FROM
+        sub_rpt_cont src
+        WHERE
+        src.sub_id = si.id
+        AND src.logic_delete_flag = 0
+        ORDER BY
+        last_update_time DESC,
+        create_time DESC
+        LIMIT 1
+        ) numBl
+        FROM
+        --             sub_camera sc
+        --             LEFT JOIN sub_info si ON sc.sub_id = si.id
+        sub_info si
+        LEFT JOIN (
+        SELECT
+        sum(amt) yearAmt,
+        sa.sub_id
+        FROM
+        sub_amtplan sa
+        WHERE
+        sa.logic_delete_flag = 0
+        AND sa.y_month LIKE  CONCAT('',#{year},'%')
+        GROUP BY
+        sa.sub_id
+        ) sa ON sa.sub_id = si.id
+        LEFT JOIN (
+        SELECT
+        sum(amt) yearAmtSj,
+        src.sub_id
+        FROM
+        sub_rpt_cont src
+        WHERE
+        src.logic_delete_flag = 0
+        AND src.kj_month LIKE  CONCAT('',#{year},'%')
+        GROUP BY
+        src.sub_id
+        ) src2 ON src2.sub_id = si.id
+        WHERE
+        --             sc.logic_delete_flag = 0
+        si.logic_delete_flag = 0
+        and si.indus_kind in('210','99','2')
+        AND si.longitude is not null
+        AND si.latitude is not null
+        AND si.subject_id  in
+        <foreach  item="item" collection="subjectIds" index="index"  open="(" separator="," close=")">
+            #{item}
+        </foreach>
+        GROUP BY
+        si.id
+    </select>
+
+<!--    <resultMap id="BaseResultMap" type="com.rtrh.projects.modules.projects.po.SubInfoGxj">
+        <id column="id" property="id" />
+        <result column="sub_id" property="subId" />
+        <result column="unit_id" property="unitId" />
+        <result column="unit_desc" property="unitDesc" />
+        <result column="sub_code" property="subCode" />
+        <result column="sub_name" property="subName" />
+        <result column="indus_kind" property="indusKind" />
+        <result column="amt_total" property="amtTotal" />
+        <result column="abc" property="abc" />
+        <result column="subject_id" property="subjectId" />
+        <result column="begin_date" property="beginDate" />
+        <result column="end_date" property="endDate" />
+        <result column="rt_date" property="rtDate" />
+        <result column="content" property="content" />
+        <result column="progress" property="progress" />
+        <result column="cb_status" property="cbStatus" />
+        <result column="qy_date" property="qyDate" />
+        <result column="xj_date" property="xjDate" />
+        <result column="zj_date" property="zjDate" />
+        <result column="tc_date" property="tcDate" />
+        <result column="cb_num" property="cbNum" />
+        <result column="xj_num" property="xjNum" />
+        <result column="zj_num" property="zjNum" />
+        <result column="remark" property="remark" />
+        <result column="name_zrr" property="nameZrr" />
+        <result column="tel" property="tel" />
+        <result column="name_lead" property="nameLead" />
+        <result column="tel_lead" property="telLead" />
+        <result column="status" property="status" />
+        <result column="is_rg" property="isRg" />
+        <result column="rg_date" property="rgDate" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="create_user_name" property="createUserName" />
+        <result column="create_time" property="createTime" />
+        <result column="last_update_user_id" property="lastUpdateUserId" />
+        <result column="last_update_user_name" property="lastUpdateUserName" />
+        <result column="last_update_time" property="lastUpdateTime" />
+        <result column="logic_delete_flag" property="logicDeleteFlag" />
+        <result column="status_lamp" property="statusLamp" />
+        <result column="kind_nature" property="kindNature" />
+    </resultMap>-->
+
+    <select id="queryPage" resultType="com.rtrh.projects.modules.projects.po.SubInfoGxj">
+        SELECT
+        s.id,
+        s.sub_id AS subId,
+        s.unit_id AS unitId,
+        s.unit_desc AS unitDesc,
+        s.sub_code AS subCode,
+        s.sub_name AS subName,
+        s.indus_kind AS indusKind,
+        s.amt_total AS amtTotal,
+        s.abc,
+        s.subject_id AS subjectId,
+        s.begin_date AS beginDate,
+        s.end_date AS endDate,
+        s.rt_date AS rtDate,
+        s.content AS content,
+        s.progress AS progress,
+        s.cb_status AS cbStatus,
+        s.qy_date AS qyDate,
+        s.xj_date AS xjDate,
+        s.zj_date AS zjDate,
+        s.tc_date AS tcDate,
+        s.cb_num AS cbNum,
+        s.xj_num AS xjNum,
+        s.zj_num AS zjNum,
+        s.remark,
+        s.name_zrr AS nameZrr,
+        s.tel AS tel,
+        s.name_lead AS nameLead,
+        s.tel_lead AS telLead,
+        s.status AS status,
+        s.is_rg AS boolRg,
+        s.rg_date AS rgDate,
+        s.create_user_id AS createUserId,
+        s.create_user_name AS createUserName,
+        s.create_time AS createTime,
+        s.last_update_user_id AS lastUpdateUserId,
+        s.last_update_user_name AS lastUpdateUserName,
+        s.last_update_time AS lastUpdateTime,
+        s.logic_delete_flag AS logicDeleteFlag,
+        s.status_lamp AS statusLamp,
+        s.kind_nature AS kindNature
+        <if test="vo.status!=null and vo.status==3 and vo.month!=null and vo.month!=''">
+            ,src.yearPlanAmt
+        </if>
+        from sub_info s
+        <if test="vo.status!=null and vo.status==3 and vo.month!=null and vo.month!=''">
+            LEFT JOIN
+            (SELECT SUM(amt) yearPlanAmt,sub_id FROM sub_amtplan WHERE y_month RLIKE #{vo.month} AND NOT ISNULL(amt) GROUP BY sub_id) src
+            ON s.id=src.sub_id
+        </if>
+        <where>
+            s.logic_delete_flag = 0
+            <if test="vo.subName!=null and vo.subName!=''">
+                and s.sub_name like CONCAT('%', #{vo.subName}, '%')
+            </if>
+            <if test="vo.kindNature!=null and vo.kindNature!=''">
+                and s.kind_nature = #{vo.kindNature}
+            </if>
+            <if test="vo.subjects!=null and vo.subjects!=''">
+                and s.subject_id = #{vo.subjects}
+            </if>
+            <if test="vo.subjectId!=null and vo.subjectId!=''">
+                and s.subject_id = #{vo.subjectId}
+            </if>
+            <if test="vo.subjectAuthIds!=null and vo.subjectAuthIds.size()>0">
+                and s.subject_id in
+                <foreach collection="vo.subjectAuthIds" item="id" open="(" close=")" separator=",">
+                    #{id}
+                </foreach>
+            </if>
+            <if test="vo.indusKind!=null and vo.indusKind!=''">
+                <if test='vo.indusKind != "UNKNOWN_INDUS_KIND"'>
+                    and s.indus_kind like CONCAT(#{vo.indusKind}, '%')
+                </if>
+                <if test='vo.indusKind.toString() == "UNKNOWN_INDUS_KIND"'>
+                    AND ISNULL(s.indus_kind)
+                </if>
+            </if>
+            <if test="vo.startAmt!=null and vo.startAmt!=''">
+                and s.amt_total >= #{vo.startAmt}
+            </if>
+            <if test="vo.endAmt!=null and vo.endAmt!=''">
+                and s.amt_total &lt;= #{vo.endAmt}
+            </if>
+            <if test="vo.sbdw!=null and vo.sbdw!=''">
+                and s.unit_desc = #{vo.sbdw}
+            </if>
+            <if test="vo.abc!=null and vo.abc!=''">
+                <choose>
+                    <when test='vo.abc.toString() =="UNKNOWN_CATEGORY"'>
+                        and s.abc is null
+                    </when>
+                    <otherwise>
+                        and s.abc = #{vo.abc}
+                    </otherwise>
+                </choose>
+            </if>
+            <if test="vo.status!=null and vo.status!=''">
+                and s.status = #{vo.status}
+                <if test="vo.status==3">
+                    <if test="vo.yearMixAmt!=null and vo.yearMixAmt!=''">
+                        and src.yearPlanAmt >=#{vo.yearMixAmt}
+                    </if>
+                    <if test="vo.yearMaxAmt!=null and vo.yearMaxAmt!=''">
+                        and src.yearPlanAmt &lt;=#{vo.yearMaxAmt}
+                    </if>
+                    <if test="vo.beginDate!=null and vo.beginDate!=''">
+                        and s.end_date >= #{vo.beginDate}
+                    </if>
+                    <if test="vo.endDate!=null and vo.endDate!=''">
+                        and s.end_date &lt;= #{vo.endDate}
+                    </if>
+                </if>
+                <if test='vo.status==2'>
+                    <if test="vo.beginDate!=null and vo.beginDate!=''">
+                        and s.begin_date >= #{vo.beginDate}
+                    </if>
+                    <if test="vo.endDate!=null and vo.endDate!=''">
+                        and s.begin_date &lt;= #{vo.endDate}
+                    </if>
+                </if>
+                <if test='vo.status==9'>
+                    <if test="vo.beginDate!=null and vo.beginDate!=''">
+                        and s.rt_date >= #{vo.beginDate}
+                    </if>
+                    <if test="vo.endDate!=null and vo.endDate!=''">
+                        and s.rt_date &lt;= #{vo.endDate}
+                    </if>
+                </if>
+            </if>
+        </where>
+    </select>
+    <select id="queryStatistics" resultType="com.rtrh.projects.modules.projects.po.SubInfoGxj">
+        select
+            status,abc,subject_id subjectId,indus_kind indusKind,is_rg AS boolRg
+        from sub_info
+        <where>
+            logic_delete_flag = 0
+            <if test="vo.subName!=null and vo.subName!=''">
+                and sub_name like CONCAT('%', #{vo.subName}, '%')
+            </if>
+            <if test="vo.subjectId!=null and vo.subjectId!=''">
+                and subject_id = #{vo.subjectId}
+            </if>
+            <if test="vo.startAmt!=null and vo.startAmt!=''">
+                and amt_total >= #{vo.startAmt}
+            </if>
+            <if test="vo.endAmt!=null and vo.endAmt!=''">
+                and amt_total &lt;= #{vo.endAmt}
+            </if>
+            <if test="vo.sbdw!=null and vo.sbdw!=''">
+                and unit_desc = #{vo.sbdw}
+            </if>
+            <if test="vo.status!=null and vo.status!=''">
+                and status = #{vo.status}
+            </if>
+            <if test="vo.subjectAuthIds!=null and vo.subjectAuthIds.size()>0">
+                and subject_id in
+                <foreach collection="vo.subjectAuthIds" item="id" open="(" close=")" separator=",">
+                    #{id}
+                </foreach>
+            </if>
+            <if test="vo.abc!=null and vo.abc!=''">
+                <choose>
+                    <when test='vo.abc.toString() =="UNKNOWN_CATEGORY"'>
+                        and abc is null
+                    </when>
+                    <otherwise>
+                        and abc = #{vo.abc}
+                    </otherwise>
+                </choose>
+            </if>
+            <if test="vo.indusKind!=null and vo.indusKind!=''">
+                <choose>
+                    <when test='vo.indusKind.toString() == "UNKNOWN_INDUS_KIND"'>
+                        AND ISNULL(indus_kind)
+                    </when>
+                    <otherwise>
+                        and indus_kind like CONCAT(#{vo.indusKind}, '%')
+                    </otherwise>
+                </choose>
+            </if>
+        </where>
+    </select>
+    <select id="findById" resultType="com.rtrh.projects.modules.projects.po.SubInfoGxj">
+        SELECT
+            id,
+            sub_id AS subId,
+            unit_id AS unitId,
+            unit_desc AS unitDesc,
+            sub_code AS subCode,
+            sub_name AS subName,
+            indus_kind AS indusKind,
+            amt_total AS amtTotal,
+            abc,
+            subject_id AS subjectId,
+            begin_date AS beginDate,
+            end_date AS endDate,
+            rt_date AS rtDate,
+            content AS content,
+            progress AS progress,
+            cb_status AS cbStatus,
+            qy_date AS qyDate,
+            xj_date AS xjDate,
+            zj_date AS zjDate,
+            tc_date AS tcDate,
+            cb_num AS cbNum,
+            xj_num AS xjNum,
+            zj_num AS zjNum,
+            remark,
+            name_zrr AS nameZrr,
+            tel AS tel,
+            name_lead AS nameLead,
+            tel_lead AS telLead,
+            status AS status,
+            is_rg AS isRg,
+            rg_date AS rgDate,
+            create_user_id AS createUserId,
+            create_user_name AS createUserName,
+            create_time AS createTime,
+            last_update_user_id AS lastUpdateUserId,
+            last_update_user_name AS lastUpdateUserName,
+            last_update_time AS lastUpdateTime,
+            status_lamp AS statusLamp,
+            kind_nature AS kindNature
+        from sub_info
+        where id = #{id}
+    </select>
+    <select id="findByFgwId" resultType="com.rtrh.projects.modules.projects.po.SubInfo">
+        SELECT
+            id,
+            unit_id AS unitId,
+            unit_desc AS unitDesc,
+            sub_code AS subCode,
+            sub_name AS subName,
+            indus_kind AS indusKind,
+            amt_total AS amtTotal,
+            abc,
+            subject_id AS subjectId,
+            begin_date AS beginDate,
+            end_date AS endDate,
+            rt_date AS rtDate,
+            content AS content,
+            progress AS progress,
+            cb_status AS cbStatus,
+            qy_date AS qyDate,
+            xj_date AS xjDate,
+            zj_date AS zjDate,
+            tc_date AS tcDate,
+            cb_num AS cbNum,
+            xj_num AS xjNum,
+            zj_num AS zjNum,
+            remark,
+            name_zrr AS nameZrr,
+            tel AS tel,
+            name_lead AS nameLead,
+            tel_lead AS telLead,
+            status AS status,
+            rg_date AS rgDate,
+            create_user_id AS createUserId,
+            create_user_name AS createUserName,
+            create_time AS createTime,
+            last_update_user_id AS lastUpdateUserId,
+            last_update_user_name AS lastUpdateUserName,
+            last_update_time AS lastUpdateTime,
+            logic_delete_flag AS logicDeleteFlag,
+            status_lamp AS statusLamp,
+            kind_nature AS kindNature
+        from sub_info
+        where id = #{id}
+    </select>
+
+    <select id="subFixCbAll" resultType="com.rtrh.projects.modules.projects.vo.SubFixCbVo">
+        SELECT sub_info.id as id,
+               sub_info.sub_name as subName,
+               sub_info.subject_id as subjectId,
+               sub_info.content as content,
+               sub_info.amt_total as amtTotal,
+               sub_info.progress as progress,
+               sub_info.remark as remark
+        FROM sub_fix
+        LEFT JOIN sub_info ON sub_fix.sub_id = sub_info.id
+        WHERE sub_fix.status = 1
+        AND sub_info.logic_delete_flag = 0
+        <if test="subFixCbSearch.year != null and subFixCbSearch.year != ''">
+            AND sub_fix.year = #{subFixCbSearch.year}
+        </if>
+        <if test="subFixCbSearch.subName != null and subFixCbSearch.subName != ''">
+            AND sub_info.sub_name LIKE CONCAT('%', #{subFixCbSearch.subName}, '%')
+        </if>
+        <if test="subFixCbSearch.subjectId != null and subFixCbSearch.subjectId != ''">
+            AND sub_info.subject_id = #{subFixCbSearch.subjectId}
+        </if>
+        <if test="subFixCbSearch.indusKind != null and subFixCbSearch.indusKind != ''">
+            AND sub_info.indus_kind = #{subFixCbSearch.indusKind}
+        </if>
+        <if test="subFixCbSearch.startAmt != null">
+            AND sub_info.amt_total >= #{subFixCbSearch.startAmt}
+        </if>
+        <if test="subFixCbSearch.endAmt != null">
+            AND sub_info.amt_total &lt;= #{subFixCbSearch.endAmt}
+        </if>
+        <if test="subFixCbSearch.sbdw != null and subFixCbSearch.sbdw != ''">
+            AND sub_info.sbdw LIKE CONCAT('%', #{subFixCbSearch.sbdw}, '%')
+        </if>
+    </select>
+    <select id="selectAllSubInfoIdsNotSubFix" resultType="java.lang.String">
+        SELECT id
+        FROM sub_info
+        <where>
+            <if test="subIdList != null and subIdList.size > 0">
+                id NOT IN
+                <foreach collection="subIdList" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
+            <if test="status != null and status != ''">
+                AND status = #{status}
+            </if>
+            AND amt_total &gt;= 10000
+        </where>
+    </select>
+
+    <select id="getFixTotalExcel" resultType="com.rtrh.projects.modules.projects.vo.SubInfoTotalExcel">
+        SELECT sub_info.subject_id as subjectId,
+               sub_info.sub_name as subName,
+               sub_info.amt_total as amtTotal,
+               sub_info.indus_kind as induskind
+        FROM sub_fix
+        LEFT JOIN sub_info ON sub_fix.sub_id = sub_info.id
+        WHERE sub_fix.cat = #{stateFix} and sub_fix.year = #{year} and sub_info.logic_delete_flag = 0
+        <if test="subName != null and subName != ''">
+            AND sub_info.sub_name LIKE CONCAT('%', #{subName}, '%')
+        </if>
+        <if test="subjectId != null and subjectId != ''">
+            AND sub_info.subject_id = #{subjectId}
+        </if>
+        <if test="subjectIds != null and subjectIds.size() &gt; 0">
+            AND sub_info.subject_id IN
+            <foreach collection="subjectIds" item="item" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="indusKinds != null and indusKinds.size() &gt; 0">
+            AND sub_info.indus_kind IN
+            <foreach collection="indusKinds" item="item" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="sbdw != null and sbdw != ''">
+            AND sub_info.unit_desc LIKE CONCAT('%', #{sbdw}, '%')
+        </if>
+        <if test="startAmt != null and startAmt !=''">
+            AND sub_info.amt_total &gt;= #{startAmt}
+        </if>
+        <if test="endAmt != null and endAmt != ''">
+            AND sub_info.amt_total &lt;= #{endAmt}
+        </if>
+    </select>
+    <select id="exportTotalExcelByStatus" resultType="com.rtrh.projects.modules.projects.vo.SubInfoTotalExcel">
+        SELECT sub_info.subject_id as subjectId,
+               sub_info.sub_name as subName,
+               sub_info.amt_total as amtTotal,
+               sub_info.indus_kind as indusKind,
+               sub_info.status as status
+               from sub_info
+        <where>
+            sub_info.logic_delete_flag = 0
+            <if test="vo.status != null and vo.status != ''">
+                and sub_info.status = #{vo.status}
+            </if>
+            <if test="vo.subName!=null and vo.subName!=''">
+                and sub_info.sub_name like CONCAT('%', #{vo.subName}, '%')
+            </if>
+            <if test="vo.subjectId!=null and vo.subjectId!=''">
+                and sub_info.subject_id = #{vo.subjectId}
+            </if>
+            <if test="vo.startAmt!=null and vo.startAmt!=''">
+                and sub_info.amt_total >= #{vo.startAmt}
+            </if>
+            <if test="vo.endAmt!=null and vo.endAmt!=''">
+                and sub_info.amt_total &lt;= #{vo.endAmt}
+            </if>
+            <if test="vo.sbdw!=null and vo.sbdw!=''">
+                and sub_info.unit_desc = #{vo.sbdw}
+            </if>
+            <if test="vo.subjectAuthIds!=null and vo.subjectAuthIds.size()>0">
+                and sub_info.subject_id in
+                <foreach collection="vo.subjectAuthIds" item="id" open="(" close=")" separator=",">
+                    #{id}
+                </foreach>
+            </if>
+            <if test="vo.abc!=null and vo.abc!=''">
+                <choose>
+                    <when test='vo.abc.toString() =="UNKNOWN_CATEGORY"'>
+                        and sub_info.abc is null
+                    </when>
+                    <otherwise>
+                        and sub_info.abc = #{vo.abc}
+                    </otherwise>
+                </choose>
+            </if>
+            <if test="vo.indusKind!=null and vo.indusKind!=''">
+                <choose>
+                    <when test='vo.indusKind.toString() == "UNKNOWN_INDUS_KIND"'>
+                        AND ISNULL(sub_info.indus_kind)
+                    </when>
+                    <otherwise>
+                        and sub_info.indus_kind like CONCAT(#{vo.indusKind}, '%')
+                    </otherwise>
+                </choose>
+            </if>
+        </where>
+    </select>
+
+    <select id="exportFixDetailExcel" resultType="com.rtrh.projects.modules.projects.vo.export.SubInfoFixDetail">
+        SELECT sub_info.id as id,
+               sub_info.sub_name as subName,
+               sub_info.subject_id as subjectId,
+               sub_info.content as content,
+               sub_info.begin_date as beginDate,
+               sub_info.amt_total as amtTotal,
+               sub_info.remark as remark,
+               sub_info.indus_kind as indusKind
+        FROM sub_fix
+                 LEFT JOIN sub_info ON sub_fix.sub_id = sub_info.id
+        WHERE sub_fix.cat = #{stateFix} and sub_fix.year = #{year} and sub_info.logic_delete_flag = 0
+        <if test="subName != null and subName != ''">
+            AND sub_info.sub_name LIKE CONCAT('%', #{subName}, '%')
+        </if>
+        <if test="subjectId != null and subjectId != ''">
+            AND sub_info.subject_id = #{subjectId}
+        </if>
+        <if test="subjectIds != null and subjectIds.size() &gt; 0">
+            AND sub_info.subject_id IN
+            <foreach collection="subjectIds" item="item" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="indusKinds != null and indusKinds.size() &gt; 0">
+            AND sub_info.indus_kind IN
+            <foreach collection="indusKinds" item="item" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="sbdw != null and sbdw != ''">
+            AND sub_info.unit_desc LIKE CONCAT('%', #{sbdw}, '%')
+        </if>
+        <if test="startAmt != null and startAmt !=''">
+            AND sub_info.amt_total &gt;= #{startAmt}
+        </if>
+        <if test="endAmt != null and endAmt != ''">
+            AND sub_info.amt_total &lt;= #{endAmt}
+        </if>
+    </select>
+
+    <select id="selectSubPreNewBySubIds" resultType="com.rtrh.projects.modules.projects.vo.SubInfoFixDetailPreNew">
+        SELECT
+            a.sub_id as subId,
+            a.status_conf as statusConf,
+            b.title as title
+        FROM
+            sub_pre_new a
+        LEFT JOIN
+            sub_pre_flow b ON a.pre_flow_id = b.id
+        WHERE
+            a.sub_id IN
+            <foreach collection="subIdList" item="subId" open="(" separator="," close=")">
+            #{subId}
+            </foreach>
+            AND a.status = 1
+            AND a.status_conf IN (1, 2);
+    </select>
+    <select id="selectNewestMonthReport" resultType="com.rtrh.projects.modules.projects.po.RptCont">
+        SELECT
+            DISTINCT
+            src.sub_id AS subId,src.content
+        FROM
+            sub_rpt_cont src
+                JOIN (
+                SELECT
+                    sub_id,
+                    MAX(kj_month) AS latest_kj_month
+                FROM
+                    sub_rpt_cont
+                WHERE
+                    logic_delete_flag = 0
+                  AND sub_id IN
+                  <foreach collection="ids" item="item" separator="," open="(" close=")">
+                      #{item}
+                  </foreach>
+                  AND kind = '1'
+                  AND content IS NOT NULL
+                GROUP BY
+                    sub_id
+            ) AS latest_src ON src.sub_id = latest_src.sub_id
+                AND src.kj_month = latest_src.latest_kj_month
+        WHERE
+            src.logic_delete_flag = 0
+          AND src.kind = '1'
+          AND src.content IS NOT NULL
+    </select>
+    <select id="exportFixCbDetailExcel" resultType="com.rtrh.projects.modules.projects.vo.export.SubInfoFixCbDetail">
+        SELECT sub_info.id as id,
+               sub_info.sub_name as subName,
+               sub_info.subject_id as subjectId,
+               sub_info.content as content,
+               sub_info.amt_total as amtTotal,
+               sub_info.remark as remark,
+               sub_info.indus_kind as indusKind,
+               sub_info.progress as progress
+        FROM sub_fix
+                 LEFT JOIN sub_info ON sub_fix.sub_id = sub_info.id
+        WHERE sub_fix.cat = #{stateFix} and sub_fix.year = #{year} and sub_info.logic_delete_flag = 0
+        <if test="subName != null and subName != ''">
+            AND sub_info.sub_name LIKE CONCAT('%', #{subName}, '%')
+        </if>
+        <if test="subjectId != null and subjectId != ''">
+            AND sub_info.subject_id = #{subjectId}
+        </if>
+        <if test="subjectIds != null and subjectIds.size() &gt; 0">
+            AND sub_info.subject_id IN
+            <foreach collection="subjectIds" item="item" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="indusKinds != null and indusKinds.size() &gt; 0">
+            AND sub_info.indus_kind IN
+            <foreach collection="indusKinds" item="item" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="sbdw != null and sbdw != ''">
+            AND sub_info.unit_desc LIKE CONCAT('%', #{sbdw}, '%')
+        </if>
+        <if test="startAmt != null and startAmt !=''">
+            AND sub_info.amt_total &gt;= #{startAmt}
+        </if>
+        <if test="endAmt != null and endAmt != ''">
+            AND sub_info.amt_total &lt;= #{endAmt}
+        </if>
+    </select>
+    <select id="exportFixZjDetailExcel" resultType="com.rtrh.projects.modules.projects.vo.export.SubInfoFixZjDetail">
+        SELECT
+            sub_info.id AS id,
+            sub_info.sub_name AS subName,
+            sub_info.subject_id AS subjectId,
+            sub_info.content AS content,
+            sub_info.amt_total AS amtTotal,
+            sub_info.end_date AS endDate,
+            sub_info.remark AS remark,
+            sub_info.indus_kind AS indusKind,
+            sub_info.progress AS progress
+        FROM
+            sub_fix
+                LEFT JOIN
+            sub_info ON sub_fix.sub_id = sub_info.id
+        WHERE
+            sub_info.logic_delete_flag = 0
+          AND sub_fix.cat = #{stateFix}
+          AND sub_fix.year = #{year}
+        <if test="subName != null and subName != ''">
+            AND sub_info.sub_name LIKE CONCAT('%', #{subName}, '%')
+        </if>
+        <if test="subjectId != null and subjectId != ''">
+            AND sub_info.subject_id = #{subjectId}
+        </if>
+        <if test="subjectIds != null and subjectIds.size() &gt; 0">
+            AND sub_info.subject_id IN
+            <foreach collection="subjectIds" item="item" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="indusKinds != null and indusKinds.size() &gt; 0">
+            AND sub_info.indus_kind IN
+            <foreach collection="indusKinds" item="item" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="sbdw != null and sbdw != ''">
+            AND sub_info.unit_desc LIKE CONCAT('%', #{sbdw}, '%')
+        </if>
+        <if test="startAmt != null and startAmt !=''">
+            AND sub_info.amt_total &gt;= #{startAmt}
+        </if>
+        <if test="endAmt != null and endAmt != ''">
+            AND sub_info.amt_total &lt;= #{endAmt}
+        </if>
+    </select>
+    <select id="selectYearMoney" resultType="com.rtrh.projects.modules.projects.vo.export.MoneyMap">
+        SELECT
+        sub_id AS subId,
+        SUM(amt) AS amt
+        FROM
+        sub_amtplan
+        WHERE
+        sub_id IN
+        <foreach collection="subIdList" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+        AND y_month LIKE CONCAT(#{year}, '%')
+        AND logic_delete_flag = 0
+        GROUP BY
+        sub_id
+    </select>
+    <select id="exportFixTcDetailExcel" resultType="com.rtrh.projects.modules.projects.vo.export.SubInfoFixTcDetail">
+        SELECT
+            sub_info.id AS id,
+            sub_info.sub_name AS subName,
+            sub_info.subject_id AS subjectId,
+            sub_info.content AS content,
+            sub_info.rg_date AS rgDate,
+            sub_info.remark AS remark,
+            sub_info.indus_kind AS indusKind,
+            sub_info.progress AS progress
+        FROM
+            sub_fix
+                LEFT JOIN
+            sub_info ON sub_fix.sub_id = sub_info.id
+        WHERE
+            sub_info.logic_delete_flag = 0
+          AND sub_fix.cat = #{stateFix}
+          AND sub_fix.year = #{year}
+        <if test="subName != null and subName != ''">
+            AND sub_info.sub_name LIKE CONCAT('%', #{subName}, '%')
+        </if>
+        <if test="subjectId != null and subjectId != ''">
+            AND sub_info.subject_id = #{subjectId}
+        </if>
+        <if test="subjectIds != null and subjectIds.size() &gt; 0">
+            AND sub_info.subject_id IN
+            <foreach collection="subjectIds" item="item" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="indusKinds != null and indusKinds.size() &gt; 0">
+            AND sub_info.indus_kind IN
+            <foreach collection="indusKinds" item="item" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="sbdw != null and sbdw != ''">
+            AND sub_info.unit_desc LIKE CONCAT('%', #{sbdw}, '%')
+        </if>
+        <if test="startAmt != null and startAmt !=''">
+            AND sub_info.amt_total &gt;= #{startAmt}
+        </if>
+        <if test="endAmt != null and endAmt != ''">
+            AND sub_info.amt_total &lt;= #{endAmt}
+        </if>
+    </select>
+    <select id="subFixGetBeginRate" resultType="com.rtrh.projects.vo.projects.SubFixGetBeginRateVo">
+        SELECT
+        sub_info.id AS id,
+        sub_info.status AS status,
+        sub_info.subject_id AS subjectId,
+        sub_info.indus_kind AS indusKind,
+        sub_info.is_rg AS isRg,
+        sub_info.abc AS abc
+        FROM sub_fix
+        LEFT JOIN sub_info ON sub_fix.sub_id = sub_info.id
+        WHERE
+        sub_fix.cat = #{queryVO.stateFix}
+        AND sub_fix.year = #{queryVO.year}
+        AND sub_info.logic_delete_flag = 0
+        <if test="queryVO.subName != null and queryVO.subName != ''">
+            AND sub_info.sub_name LIKE CONCAT('%', #{queryVO.subName}, '%')
+        </if>
+        <if test="queryVO.subjectId != null and queryVO.subjectId != ''">
+            AND sub_info.subject_id = #{queryVO.subjectId}
+        </if>
+        <if test="subjectIds != null and subjectIds.size() &gt; 0">
+            AND sub_info.subject_id IN
+            <foreach collection="subjectIds" item="item" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="indusKinds != null and indusKinds.size() &gt; 0">
+            AND sub_info.indus_kind IN
+            <foreach collection="indusKinds" item="item" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="queryVO.sbdw != null and queryVO.sbdw != ''">
+            AND sub_info.unit_desc LIKE CONCAT('%', #{queryVO.sbdw}, '%')
+        </if>
+        <if test="queryVO.startAmt != null and queryVO.startAmt != ''">
+            AND sub_info.amt_total &gt;= #{queryVO.startAmt}
+        </if>
+        <if test="queryVO.endAmt != null and queryVO.endAmt != ''">
+            AND sub_info.amt_total &lt;= #{queryVO.endAmt}
+        </if>
+    </select>
+    <select id="subFixGetAll" resultType="com.rtrh.projects.modules.projects.vo.SubFixListVo">
+        select
+            b.id as id,
+            b.sub_name as subName,
+            b.subject_id as subjectId,
+            b.content as content,
+            b.amt_total as amtTotal,
+            b.progress as progress,
+            b.remark as remark,
+            b.begin_date as beginDate,
+            b.end_date as endDate,
+            b.rt_date as rtDate
+        from sub_fix a left join sub_info b on a.sub_id = b.id
+        where a.cat = #{queryVO.stateFix} and a.year = #{queryVO.year} and b.logic_delete_flag = 0
+        <if test="queryVO.subName != null and queryVO.subName != ''">
+            AND b.sub_name LIKE CONCAT('%', #{queryVO.subName}, '%')
+        </if>
+        <if test="queryVO.subjectId != null and queryVO.subjectId != ''">
+            AND b.subject_id = #{queryVO.subjectId}
+        </if>
+        <if test="indusKinds != null and indusKinds.size() &gt; 0">
+            AND b.indus_kind IN
+            <foreach collection="indusKinds" item="item" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="subjectIds != null and subjectIds.size() &gt; 0">
+            AND b.subject_id IN
+            <foreach collection="subjectIds" item="item" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="queryVO.sbdw != null and queryVO.sbdw != ''">
+            AND b.unit_desc LIKE CONCAT('%', #{queryVO.sbdw}, '%')
+        </if>
+        <if test="queryVO.startAmt != null and queryVO.startAmt != ''">
+            AND b.amt_total &gt;= #{queryVO.startAmt}
+        </if>
+        <if test="queryVO.endAmt != null and queryVO.endAmt != ''">
+            AND b.amt_total &lt;= #{queryVO.endAmt}
+        </if>
+    </select>
+    <!--预警-->
+    <select id="queryWarning" resultType="java.lang.Long">
+        SELECT SUM(counts)
+        FROM (
+        -- 已签约预警(未转新建)
+        SELECT COUNT(*) AS counts
+        FROM sub_info
+        WHERE cb_status = 3
+        AND qy_date IS NOT NULL
+        AND DATE_ADD(qy_date, INTERVAL cb_num DAY) > NOW()
+        AND DATE_ADD(qy_date, INTERVAL cb_num DAY) &lt; DATE_ADD(NOW(), INTERVAL 3 DAY)
+        AND `status` = 1
+
+        UNION ALL
+
+        -- 新建未转在建预警
+        SELECT COUNT(*) AS counts
+        FROM sub_info
+        WHERE begin_date > NOW()
+        AND begin_date &lt; DATE_ADD(NOW(), INTERVAL 3 DAY)
+        AND `status` = 2
+
+        UNION ALL
+
+        -- 在建未转投产预警
+        SELECT COUNT(*) AS counts
+        FROM sub_info
+        WHERE end_date > NOW()
+        AND end_date &lt; DATE_ADD(NOW(), INTERVAL 3 DAY)
+        AND `status` = 3
+
+        UNION ALL
+
+        -- 投产未入规预警
+        SELECT COUNT(*) AS counts
+        FROM sub_info
+        WHERE rt_date > NOW()
+        AND rt_date &lt; DATE_ADD(NOW(), INTERVAL 3 DAY)
+        AND `status` = 9
+        AND is_rg = 0
+        ) AS combined_counts;
+    </select>
+    <!-- 超期 -->
+    <select id="queryExceed" resultType="java.lang.Long">
+        SELECT SUM(counts) AS total_count
+        FROM (
+                 -- 已签约(未转新建)
+                 SELECT COUNT(*) AS counts
+                 FROM sub_info
+                 WHERE cb_status = 3
+                   AND qy_date IS NOT NULL
+                   AND DATE_ADD(qy_date, INTERVAL cb_num DAY) &lt; NOW()
+                   AND `status` = 1
+
+                 UNION ALL
+
+                 -- 新建未转在建
+                 SELECT COUNT(*) AS counts
+                 FROM sub_info
+                 WHERE
+                     begin_date  &lt;  NOW()
+                   AND `status` = 2
+
+                 UNION ALL
+
+                 -- 在建未转投产
+                 SELECT COUNT(*) AS counts
+                 FROM sub_info
+                 WHERE end_date  &lt;  NOW()
+                   AND `status` = 3
+
+                 UNION ALL
+
+                 -- 投产未入规
+                 SELECT COUNT(*) AS counts
+                 FROM sub_info
+                 WHERE rt_date  &lt;  NOW()
+                   AND is_rg = 0
+                   AND `status` = 9
+             ) AS combined_counts;
+    </select>
+    <!-- 绿灯 未超期-->
+    <select id="queryNotExceed" resultType="java.lang.Long">
+        SELECT SUM(counts) AS total_count
+        FROM (
+        -- 已签约绿灯(未转新建)
+        SELECT COUNT(*) AS counts
+        FROM sub_info
+        WHERE cb_status = 3
+        AND qy_date IS NOT NULL
+        AND DATE_ADD(qy_date, INTERVAL cb_num DAY) > NOW()
+        AND `status` = 1
+
+        UNION ALL
+
+        -- 新建未转在建
+        SELECT COUNT(*) AS counts
+        FROM sub_info
+        WHERE
+            begin_date > NOW()
+        AND `status` = 2
+
+        UNION ALL
+
+        -- 在建未转投产
+        SELECT COUNT(*) AS counts
+        FROM sub_info
+        WHERE
+            end_date > NOW()
+        AND `status` = 3
+
+        UNION ALL
+
+        -- 投产未入规
+        SELECT COUNT(*) AS counts
+        FROM sub_info
+        WHERE
+            rt_date > NOW()
+        AND is_rg = 0
+        AND `status` = 9
+        ) AS combined_counts;
+    </select>
+    <!-- 黄灯超期3天内 -->
+    <select id="queryExceedWithin" resultType="java.lang.Long">
+        SELECT SUM(counts) AS total_count
+        FROM (
+                 -- 已签约(未转新建)
+                 SELECT COUNT(*) AS counts
+                 FROM sub_info
+                 WHERE cb_status = 3
+                   AND qy_date IS NOT NULL
+                   AND DATE_ADD(qy_date, INTERVAL cb_num DAY) > DATE_SUB(NOW(), INTERVAL 3 DAY)
+                   AND DATE_ADD(qy_date, INTERVAL cb_num DAY) &lt; NOW()
+                   AND `status` = 1
+
+                 UNION ALL
+
+                 -- 新建未转在建
+                 SELECT COUNT(*) AS counts
+                 FROM sub_info
+                 WHERE
+                     begin_date > DATE_SUB(NOW(), INTERVAL 3 DAY)
+                   AND begin_date &lt; NOW()
+                   AND `status` = 2
+
+                 UNION ALL
+
+                 -- 在建未转投产
+                 SELECT COUNT(*) AS counts
+                 FROM sub_info
+                 WHERE
+                     end_date > DATE_SUB(NOW(), INTERVAL 3 DAY)
+                   AND end_date &lt; NOW()
+                   AND `status` = 3
+
+                 UNION ALL
+
+                 -- 投产未入规
+                 SELECT COUNT(*) AS counts
+                 FROM sub_info
+                 WHERE
+                       rt_date > DATE_SUB(NOW(), INTERVAL 3 DAY)
+                   AND rt_date &lt; NOW()
+                   AND is_rg = 0
+                   AND `status` = 9
+             ) AS combined_counts;
+    </select>
+    <!-- 红灯超期3天 -->
+    <select id="queryExceedOutside" resultType="java.lang.Long">
+        SELECT SUM(counts) AS total_count
+        FROM (
+                 -- 已签约(未转新建)
+                 SELECT COUNT(*) AS counts
+                 FROM sub_info
+                 WHERE cb_status = 3
+                   AND qy_date IS NOT NULL
+                   AND DATE_ADD(qy_date, INTERVAL cb_num DAY) &lt; DATE_SUB(NOW(), INTERVAL 3 DAY)
+                   AND `status` = 1
+
+                 UNION ALL
+
+                 -- 新建未转在建
+                 SELECT COUNT(*) AS counts
+                 FROM sub_info
+                 WHERE
+                     begin_date &lt; DATE_SUB(NOW(), INTERVAL 3 DAY)
+                   AND `status` = 2
+
+                 UNION ALL
+
+                 -- 在建未转投产
+                 SELECT COUNT(*) AS counts
+                 FROM sub_info
+                 WHERE end_date &lt; DATE_SUB(NOW(), INTERVAL 3 DAY)
+                   AND `status` = 3
+
+                 UNION ALL
+
+                 -- 投产未入规
+                 SELECT COUNT(*) AS counts
+                 FROM sub_info
+                 WHERE rt_date &lt; DATE_SUB(NOW(), INTERVAL 3 DAY)
+                   AND is_rg = 0
+                   AND `status` = 9
+             ) AS combined_counts;
+    </select>
+    <!-- 储备转新建超期统计 -->
+    <select id="queryExceedCbToXj" resultType="com.rtrh.projects.modules.projects.vo.WorkBenchVO">
+        SELECT
+            a.subject_id subjectId,
+            a.indus_kind indusKind,
+            a.amt_total amtTotal
+        FROM
+           sub_info a
+        WHERE
+            a.STATUS = '1'
+            AND ( a.cb_status = '3' OR a.cb_status = '4' OR a.cb_status = '5' )
+            AND DATE_ADD( a.qy_date, INTERVAL ifnull( cb_num, 0 ) DAY ) &lt;= now()
+            AND a.logic_delete_flag = 0
+    </select>
+    <select id="queryWarningStatistics" resultType="com.rtrh.projects.modules.projects.vo.WorkBenchVO">
+        SELECT
+            id,
+            STATUS,
+            cb_status cbStatus,
+            qy_date qyDate,
+            begin_date beginDate,
+            end_date endDate,
+            rt_date rtDate
+        FROM
+            sub_info
+        WHERE
+            logic_delete_flag = 0
+    </select>
+    <select id="queryExceedXjToZj" resultType="com.rtrh.projects.modules.projects.vo.WorkBenchVO">
+        SELECT subject_id subjectId,
+               indus_kind indusKind,
+               amt_total amtTotal
+        FROM sub_info
+        WHERE
+          begin_date &lt;= NOW()
+          AND `status` = 2
+          AND logic_delete_flag = 0
+    </select>
+    <select id="queryExceedZjTotc" resultType="com.rtrh.projects.modules.projects.vo.WorkBenchVO">
+        SELECT subject_id subjectId,
+               indus_kind indusKind,
+               amt_total amtTotal
+        FROM sub_info
+        WHERE
+            end_date &lt;= NOW()
+          AND `status` = 3
+          AND logic_delete_flag = 0
+    </select>
+    <select id="queryExceedTcToRg" resultType="com.rtrh.projects.modules.projects.vo.WorkBenchVO">
+        SELECT subject_id subjectId,
+               indus_kind indusKind,
+               amt_total amtTotal
+        FROM sub_info
+        WHERE
+            rt_date &lt;= NOW()
+          AND (is_rg = 0 or is_rg is null)
+          AND `status` = 9
+          and rt_date is not null
+          and logic_delete_flag=0
+    </select>
+    <select id="preProcedureExceed" resultType="com.rtrh.projects.modules.projects.vo.WorkBenchVO">
+        SELECT
+            c.subject_id subjectId,
+            c.indus_kind indusKind,
+            c.amt_total amtTotal
+        FROM
+            sub_pre_new a
+            LEFT JOIN sub_info c ON a.sub_id = c.id
+        WHERE
+            c.logic_delete_flag = 0
+            AND a.logic_delete_flag = 0
+            AND a.`status` = 1
+            AND (
+            ( status_conf = '1' AND DATE_ADD( a.date_plan, INTERVAL a.num2 DAY ) &lt; NOW() )
+            OR ( status_conf = '2' AND DATE_ADD( a.date_plan, INTERVAL a.num2 DAY ) &lt; a.date_confirm )
+            )
+           and c.indus_kind in('210','99','2')
+        GROUP BY
+            a.id
+    </select>
+    <select id="queryExceedMonthly" resultType="com.rtrh.projects.modules.projects.vo.WorkBenchVO">
+        SELECT
+            a.subject_id subjectId,
+            a.indus_kind indusKind,
+            a.amt_total amtTotal
+        FROM
+            sub_info a
+                LEFT JOIN sub_rpt_cont src ON src.sub_id = a.id
+                AND src.kind = '1'
+                AND src.kj_month LIKE #{lastMonth}
+        WHERE
+            a.logic_delete_flag = 0
+          AND a.`status` = '7'
+          and a.indus_kind in('210','99','2')
+          AND src.id IS NULL
+        GROUP BY
+            a.id
+    </select>
+
+    <select id="getSubInfoByFgwId" resultType="map" parameterType="string">
+        SELECT
+            sa.yearAmt,
+            src.yearAmtSj,
+            src.yearAmtRt,
+            IF
+            ( sa.yearAmt != 0, ROUND(( src.yearAmtSj - sa.yearAmt ) * 100 / sa.yearAmt, 2 ), NULL ) AS `offset`,
+            sqi.title problemReason,
+            IF
+            ( us.id IS NULL, 0, 1 ) AS isBl,
+            a.*,
+            b.title AS unitName,
+            f.title AS mainName,
+            c.title AS indusName,
+            d.title AS manageName,
+            e.title subjectId
+        FROM
+        sub_info a
+        LEFT JOIN j_unit b ON a.unit_id = b.id
+        LEFT JOIN j_unit d ON a.manage_id = d.id
+        LEFT JOIN j_unit f ON a.main_id = f.id
+        LEFT JOIN t_systable c ON a.indus_kind = c.id
+        LEFT JOIN t_systable e ON a.subject_id = e.id
+        LEFT JOIN sec_user_sub us ON a.id = us.sub_id
+        AND us.logic_delete_flag = 0
+        LEFT JOIN sub_q_info sqi ON sqi.sub_id = a.id
+        AND sqi.logic_delete_flag = 0
+        AND sqi.`status` = '0'
+        AND sqi.kind = 2
+        LEFT JOIN (
+        SELECT
+        sum( amt ) yearAmt,
+        sa.sub_id
+        FROM
+        sub_amtplan sa
+        WHERE
+        sa.logic_delete_flag = 0
+        AND sa.y_month >= #{queryYear}
+        AND sa.y_month &lt;= #{queryYear}
+        GROUP BY
+        sa.sub_id
+        ) sa ON sa.sub_id = a.id
+        LEFT JOIN (
+        SELECT
+        sum( amt ) yearAmtSj,
+        sum( amt_rt ) yearAmtRt,
+        src.sub_id
+        FROM
+        sub_rpt_cont src
+        WHERE
+        src.logic_delete_flag = 0
+        AND src.kj_month >= #{queryYear}
+        AND src.kj_month &lt;= #{queryYear}
+        GROUP BY
+        src.sub_id
+        ) src ON src.sub_id = a.id
+        WHERE
+        a.id = #{id}
+        GROUP BY
+        a.id
+    </select>
+</mapper>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/projects/mapper/SubInfoQueryMapper.xml

@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.rtrh.projects.modules.projects.mapper.SubInfoQueryMapper">
+
+    <select id="pageGraphicProgress" resultType="map" parameterType="map">
+
+        select
+        a.id,
+        a.is_hide as isHide,
+        sa.yearAmt,
+        src2.yearAmtSj,
+        a.prop_kind AS propKind,
+        a.indus_kind as indusKind,
+        a.status_fgw,
+        a.sub_name as subName,
+        a.amt_total as amtTotal,
+        DATE_FORMAT(a.begin_date, '%Y-%m-%d') AS beginDate,
+        DATE_FORMAT(a.end_date, '%Y-%m-%d') AS endDate,
+        a.`status`,
+        b.title as unitName,
+        num_bl_subquery.num_bl
+        from
+        week_and_month_file wamf
+        LEFT JOIN sub_rpt_cont src ON src.id = wamf.main_id
+        LEFT JOIN sub_info a ON a.id = src.sub_id
+        LEFT JOIN j_unit b ON a.unit_id = b.id
+        LEFT JOIN sub_manage d ON a.id = d.sub_id AND d.logic_delete_flag = 0
+        LEFT JOIN sub_verify e ON a.id = e.sub_id AND e.logic_delete_flag = 0
+        LEFT JOIN (SELECT sum(amt) as yearAmt, sa.sub_id FROM sub_amtplan sa WHERE sa.logic_delete_flag = 0 AND sa.y_month like CONCAT('',#{year}, '%') GROUP BY sa.sub_id) sa ON sa.sub_id = a.id
+        LEFT JOIN (SELECT sum(amt) as yearAmtSj, src.sub_id FROM sub_rpt_cont src WHERE src.logic_delete_flag = 0 AND src.kj_month like CONCAT('',#{year}, '%') GROUP BY src.sub_id) src2 ON src2.sub_id = a.id
+
+        LEFT JOIN (
+        SELECT t.sub_id, t.num_bl
+        from (
+        SELECT
+        src.sub_id,
+        src.num_bl,
+        @row_number := if(@prev_sub_id = src.sub_id, @row_number + 1, 1) as row_num,
+        @prev_sub_id := src.sub_id
+        FROM sub_rpt_cont src
+        WHERE src.logic_delete_flag = 0
+        ORDER BY src.sub_id, src.last_update_time DESC, src.create_time DESC
+        ) t
+        WHERE t.row_num = 1
+        ) num_bl_subquery ON num_bl_subquery.sub_id = a.id
+        where
+        wamf.logic_delete_flag = 0
+        and src.logic_delete_flag = 0
+        AND (wamf.file_type = '101' or wamf.file_type = '102' or wamf.file_type = '203')
+        AND a.status!= '0'
+
+
+
+                <if test="subName!= null and subName!= ''">
+                    AND a.sub_name = #{subName}
+                </if>
+                <if test="subjectId!= null and subjectId!= ''">
+                    AND a.subject_id = #{subjectId}
+                </if>
+                <if test="indusKind!= null and indusKind!= ''">
+                    AND a.indus_kind = #{indusKind}
+                </if>
+                <if test="kind!= null and kind!= ''">
+                    AND a.kind = #{kind}
+                </if>
+                <if test="numBlMin!= null">
+                    AND num_bl_subquery.num_bl >= #{numBlMin}
+                </if>
+                <if test="numBlMax!= null">
+                    AND num_bl_subquery.num_bl &lt;= #{numBlMax}
+                </if>
+                <if test="propKind!= null and propKind!= ''">
+                    AND a.prop_kind = #{propKind}
+                </if>
+
+
+        group by
+        a.id
+    </select>
+
+    <select id="selectPageZk" resultType="map" parameterType="map">
+
+        SELECT
+            (SELECT COUNT(*) FROM sub_pre_new spn3 WHERE a.id = spn3.sub_id AND spn3.logic_delete_flag = 0) AS preTotal,
+            ts1.title AS indusKindName,
+            a.content,
+            a.end_date,
+            ts.title AS subjectName,
+            a.amt_year,
+            b.title AS unitTitle,
+            c.title AS mainTitle,
+            a.create_user_id,
+            a.abc,
+            a.score,
+            a.assess_reason AS assessReason,
+            spn.status AS xmbaIs,
+            spn2.status AS yjbgIs,
+            spn.status_conf AS xmbaStatus,
+            spn2.status_conf AS yjbgStatus,
+            CASE WHEN sa.yearAmt!= 0 THEN ROUND((src.yearAmtSj - sa.yearAmt) * 100 / sa.yearAmt, 2) ELSE NULL END AS offset,
+            CASE WHEN sa.yearAmt!= 0 THEN ROUND((src.yearAmtSj) * 100 / sa.yearAmt, 2) ELSE NULL END AS monthAmtRate,
+            su.title AS leaderName,
+            su.sim_code AS leaderPhone,
+            su.job AS leaderJob,
+            COALESCE(us.id, 0) AS usersub,
+            sa.yearAmt AS yearAmt,
+            src.yearAmtSj AS yearAmtSj,
+            src.yearAmtRt AS yearAmtRt,
+            a.id,
+            a.is_hide AS isHide,
+            a.status_fgw,
+            CASE WHEN a.status_fgw = '2' THEN 1 ELSE 0 END AS redNum,
+            CASE WHEN a.status_fgw = '1' THEN 1 ELSE 0 END AS yellowNum,
+            a.date_fgw,
+            a.indus_kind AS indusKind,
+            a.subject_id,
+            a.name_lead,
+            a.tel_lead,
+            a.name_zrr,
+            a.tel,
+            a.sub_name AS subName,
+            a.yb_content AS ybContent,
+            a.kind,
+            a.prop_kind AS propKind,
+            a.amt_total AS amtTotal,
+            a.reason,
+            a.unit_id AS unitId,
+            a.create_time,
+            COALESCE(( SELECT GROUP_CONCAT( CONCAT( sa.y_month, 'nbsk', sa.assign_amt, 'nbsk', COALESCE(sa.remark, ' ') ) SEPARATOR 'nbsy' ) FROM sub_amtplan sa WHERE sa.sub_id = a.id AND sa.y_month LIKE '2025%' AND sa.amt IS NOT NULL GROUP BY sa.sub_id ), 0) AS assignAmt,
+            COALESCE(( SELECT GROUP_CONCAT(b.title SEPARATOR ',') FROM sub_source g LEFT JOIN t_systable b ON g.source_id = b.id WHERE g.sub_id = a.id AND g.logic_delete_flag = 0 GROUP BY g.sub_id ), '--') AS zjlyName,
+            COALESCE(( SELECT content FROM sub_rpt_cont src WHERE src.sub_id = a.id ORDER BY id DESC LIMIT 1 ), ' ') AS subEvolve,
+            a.begin_date,
+            a.reason_no_rk AS reasonNoRk,
+            a.sort1,
+            a.sort,
+            a.reason_no_amt AS reasonNoAmt,
+            a.reason_no_kg AS reasonNoKg,
+            a.reason_q AS reasonq,
+            a.reason_jd AS reasonJd,
+            a.is_rk AS isRk,
+            a.kind_nature,
+            COALESCE(a.amt_comp, 0) AS amtComp,
+            COALESCE(num_total, 0) AS numTotal,
+            COALESCE(a.num_comp, 0) AS numComp,
+            DATE_FORMAT(a.end_date, '%Y-%m-%d') AS endDate,
+            b.title AS unitName,
+            c.title AS mainName,
+            DATE_FORMAT(a.begin_date, '%Y-%m-%d') AS beginDate,
+            a.status,
+            a.status_jh AS statusJh,
+            a.status_sp AS statusSp,
+            a.work_space_img AS fileId,
+            COALESCE(( SELECT SUM(amt) FROM sub_amtplan sa WHERE sa.sub_id = a.id AND sa.y_month LIKE '2025%' AND sa.amt IS NOT NULL GROUP BY sa.sub_id ), 0) AS yearPlanAmt,
+            COALESCE(( SELECT SUM(amt) FROM sub_rpt_cont src WHERE src.sub_id = a.id AND src.kj_month LIKE '2025%' AND src.amt IS NOT NULL GROUP BY src.sub_id ), 0) AS yearEndAmt,
+            COALESCE(( SELECT SUM(amt) FROM sub_rpt_cont src3 WHERE src3.sub_id = a.id AND src3.amt IS NOT NULL GROUP BY src3.sub_id ), 0) AS allAmt
+        FROM sub_info a
+                 LEFT JOIN j_unit b ON a.unit_id = b.id
+                 LEFT JOIN j_unit c ON a.main_id = c.id
+                 LEFT JOIN t_systable ts ON ts.`code` = a.subject_id AND ts.kind = 'JSDD'
+                 LEFT JOIN t_systable ts1 ON ts1.id = a.indus_kind
+                 LEFT JOIN sub_label sla ON sla.sub_id = a.id AND sla.logic_delete_flag = 0
+                 LEFT JOIN ( SELECT SUM(amt) AS yearAmt, sa.sub_id FROM sub_amtplan sa WHERE sa.logic_delete_flag = 0 AND sa.y_month >= '202501' GROUP BY sa.sub_id ) sa ON sa.sub_id = a.id
+                 LEFT JOIN ( SELECT SUM(amt) AS yearAmtSj, SUM(src.amt_rt) AS yearAmtRt, src.sub_id FROM sub_rpt_cont src WHERE src.logic_delete_flag = 0 AND src.kj_month >= '202501' GROUP BY src.sub_id ) src ON src.sub_id = a.id
+                 LEFT JOIN sub_verify e ON a.id = e.sub_id AND e.logic_delete_flag = 0
+                 LEFT JOIN sub_manage d ON a.id = d.sub_id AND d.logic_delete_flag = 0
+                 LEFT JOIN sec_user_sub us ON a.id = us.sub_id AND us.logic_delete_flag = 0
+                 LEFT JOIN sub_pre_new spn ON spn.sub_id = a.id AND spn.pre_flow_id = '3' AND spn.logic_delete_flag = 0
+                 LEFT JOIN sub_pre_new spn2 ON spn2.sub_id = a.id AND spn2.pre_flow_id = '4' AND spn2.logic_delete_flag = 0
+                 LEFT JOIN sec_user su ON su.id = us.user_id AND su.logic_delete_flag = 0
+                 LEFT JOIN sub_major mar ON mar.sub_id = a.id
+        WHERE a.logic_delete_flag = 0
+          AND a.status IN ('1', '6', '7', '8', 'A')
+                 <if test="subName!= null and subName!= ''">
+                     AND a.sub_name = #{subName}
+                 </if>
+        GROUP BY a.id
+        ORDER BY sort1 DESC, usersub DESC, a.begin_date, a.create_time DESC
+    </select>
+</mapper>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/projects/mapper/SubPreNewMapper.xml

@@ -0,0 +1,380 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.rtrh.projects.modules.projects.mapper.SubPreNewMapper">
+
+    <select id="pageQueryCbToXjData" resultType="map" parameterType="map">
+        SELECT
+        a.id as id,
+        a.sub_code as subCode,
+        a.sub_name as subName,
+        a.begin_date as beginDate,
+        a.end_date as endDate,
+        d.title as unitTitle,
+        c.title as mainTitle,
+        a.qy_date as qyDate,
+        a.cb_num as cbNum,
+        ts.title as indusName,
+        concat(a.name_lead,':',a.tel_lead) as datePlan
+        FROM
+        sub_info a
+        LEFT JOIN j_unit d ON a.unit_id = d.id
+        LEFT JOIN j_unit c ON a.main_id = c.id
+        LEFT JOIN t_systable ts ON ts.id = a.indus_kind
+        WHERE
+        a.STATUS = '1'
+        AND ( a.cb_status = '3' OR a.cb_status = '4' OR a.cb_status = '5' )
+        AND DATE_ADD( a.qy_date, INTERVAL ifnull( a.cb_num, 0 ) DAY ) &lt;= now()
+        AND a.logic_delete_flag = 0
+        <if test="null != subjectId and '' != subjectId">
+            AND a.subject_id = #{subjectId}
+        </if>
+        <if test="null != subName and '' != subName">
+            AND a.sub_name like concat('%',#{subName},'%')
+        </if>
+        <if test="propKind != null and propKind != ''">
+            AND a.prop_kind IN (${propKind})
+        </if>
+        <if test="hyfl != null and hyfl != ''">
+            <choose>
+                <when test="hyfl == '未知行业'.toString()">
+                    and (a.indus_kind is null or a.indus_kind = '')
+                </when>
+                <otherwise>
+                    and a.indus_kind like concat(#{hyfl},'%')
+                </otherwise>
+            </choose>
+        </if>
+        <if test="code != null and code != ''">
+            <choose>
+                <when test="code == '1'.toString()">
+                    AND a.amt_total &lt; 100000
+                </when>
+                <when test="code == '2'.toString()">
+                    AND a.amt_total between 100000 and 500000
+                </when>
+                <when test="code == '3'.toString()">
+                    AND a.amt_total between 500000 and 1000000
+                </when>
+                <when test="code == '4'.toString()">
+                    AND a.amt_total &gt; 1000000
+                </when>
+            </choose>
+
+        </if>
+        <if test="lightType != null and lightType != ''">
+            <choose>
+                <when test="lightType == '1'.toString()">
+                    and DATEDIFF(now(), DATE_ADD(a.qy_date, INTERVAL ifnull(a.cb_num,0) DAY)) &gt; 3
+                </when>
+                <otherwise>
+                    and DATEDIFF(now(), DATE_ADD(a.qy_date, INTERVAL ifnull(a.cb_num,0) DAY)) &lt;= 3
+                </otherwise>
+            </choose>
+        </if>
+    </select>
+
+    <select id="pageQueryXjToZjData" resultType="map" parameterType="map">
+        SELECT
+        a.id as id,
+        a.sub_code as subCode,
+        a.sub_name as subName,
+        a.begin_date as beginDate,
+        a.end_date as endDate,
+        d.title as unitTitle,
+        c.title as mainTitle,
+        ts.title as indusName,
+        concat(a.name_lead,':',a.tel_lead) as datePlan
+        FROM
+        sub_info a
+        LEFT JOIN j_unit d ON a.unit_id = d.id
+        LEFT JOIN j_unit c ON a.main_id = c.id
+        LEFT JOIN t_systable ts ON ts.id = a.indus_kind
+        WHERE
+        a.begin_date &lt;= NOW()
+        AND a.`status` = 2
+        AND a.logic_delete_flag = 0
+        <if test="null != subjectId and '' != subjectId">
+            AND a.subject_id = #{subjectId}
+        </if>
+        <if test="null != subName and '' != subName">
+            AND a.sub_name like concat('%',#{subName},'%')
+        </if>
+        <if test="propKind != null and propKind != ''">
+            AND a.prop_kind IN (${propKind})
+        </if>
+        <if test="hyfl != null and hyfl != ''">
+            <choose>
+                <when test="hyfl == '未知行业'.toString()">
+                    and (a.indus_kind is null or a.indus_kind = '')
+                </when>
+                <otherwise>
+                    and a.indus_kind like concat(#{hyfl},'%')
+                </otherwise>
+            </choose>
+        </if>
+        <if test="code != null and code != ''">
+            <choose>
+                <when test="code == '1'.toString()">
+                    AND a.amt_total &lt; 100000
+                </when>
+                <when test="code == '2'.toString()">
+                    AND a.amt_total between 100000 and 500000
+                </when>
+                <when test="code == '3'.toString()">
+                    AND a.amt_total between 500000 and 1000000
+                </when>
+                <when test="code == '4'.toString()">
+                    AND a.amt_total &gt; 1000000
+                </when>
+            </choose>
+
+        </if>
+        <if test="lightType != null and lightType != ''">
+            <choose>
+                <when test="lightType == '1'.toString()">
+                    and DATEDIFF(now(), a.begin_date) &gt; 3
+                </when>
+                <otherwise>
+                    and DATEDIFF(now(), a.begin_date) &lt;= 3
+                </otherwise>
+            </choose>
+        </if>
+    </select>
+
+    <select id="pageQueryZjToTcData" resultType="map" parameterType="map">
+        SELECT
+            a.id,
+            a.sub_code as subCode,
+            a.sub_name as subName,
+            a.begin_date as beginDate,
+            a.end_date as endDate,
+            d.title as unitTitle,
+            c.title as mainTitle,
+            ts.title as indusName,
+            concat(a.name_lead,':',a.tel_lead) as datePlan
+        FROM
+        sub_info a
+        LEFT JOIN j_unit d ON a.unit_id = d.id
+        LEFT JOIN j_unit c ON a.main_id = c.id
+        LEFT JOIN t_systable ts ON ts.id = a.indus_kind
+        WHERE
+        a.end_date &lt;= NOW()
+        AND a.`status` = 3
+        AND a.logic_delete_flag = 0
+        <if test="null != subjectId and '' != subjectId">
+            AND a.subject_id = #{subjectId}
+        </if>
+        <if test="null != subName and '' != subName">
+            AND a.sub_name like concat('%',#{subName},'%')
+        </if>
+        <if test="propKind != null and propKind != ''">
+            AND a.prop_kind IN (${propKind})
+        </if>
+        <if test="hyfl != null and hyfl != ''">
+            <choose>
+                <when test="hyfl == '未知行业'.toString()">
+                    and (a.indus_kind is null or a.indus_kind = '')
+                </when>
+                <otherwise>
+                    and a.indus_kind like concat(#{hyfl},'%')
+                </otherwise>
+            </choose>
+        </if>
+        <if test="code != null and code != ''">
+            <choose>
+                <when test="code == '1'.toString()">
+                    AND a.amt_total &lt; 100000
+                </when>
+                <when test="code == '2'.toString()">
+                    AND a.amt_total between 100000 and 500000
+                </when>
+                <when test="code == '3'.toString()">
+                    AND a.amt_total between 500000 and 1000000
+                </when>
+                <when test="code == '4'.toString()">
+                    AND a.amt_total &gt; 1000000
+                </when>
+            </choose>
+
+        </if>
+        <if test="lightType != null and lightType != ''">
+            <choose>
+                <when test="lightType == '1'.toString()">
+                    and DATEDIFF(now(), a.end_date) &gt; 3
+                </when>
+                <otherwise>
+                    and DATEDIFF(now(), a.end_date) &lt;= 3
+                </otherwise>
+            </choose>
+        </if>
+    </select>
+
+    <select id="pageQueryTcToRgData" resultType="map" parameterType="map">
+        SELECT
+            a.id,
+            a.sub_code as subCode,
+            a.sub_name as subName,
+            a.begin_date as beginDate,
+            a.end_date as endDate,
+            d.title as unitTitle,
+            c.title as mainTitle,
+            a.rt_date as rtDate,
+            ts.title as indusName,
+            concat(a.name_lead,':',a.tel_lead) as datePlan
+        FROM
+        sub_info a
+        LEFT JOIN j_unit d ON a.unit_id = d.id
+        LEFT JOIN j_unit c ON a.main_id = c.id
+        LEFT JOIN t_systable ts ON ts.id = a.indus_kind
+        WHERE
+        a.rt_date &lt;= NOW()
+        AND (a.is_rg = 0 or a.is_rg is null)
+        AND a.`status` = 9
+        and a.rt_date is not null
+        and a.logic_delete_flag=0
+        <if test="null != subjectId and '' != subjectId">
+            AND a.subject_id = #{subjectId}
+        </if>
+        <if test="null != subName and '' != subName">
+            AND a.sub_name like concat('%',#{subName},'%')
+        </if>
+        <if test="propKind != null and propKind != ''">
+            AND a.prop_kind IN (${propKind})
+        </if>
+        <if test="hyfl != null and hyfl != ''">
+            <choose>
+                <when test="hyfl == '未知行业'.toString()">
+                    and (a.indus_kind is null or a.indus_kind = '')
+                </when>
+                <otherwise>
+                    and a.indus_kind like concat(#{hyfl},'%')
+                </otherwise>
+            </choose>
+        </if>
+        <if test="code != null and code != ''">
+            <choose>
+                <when test="code == '1'.toString()">
+                    AND a.amt_total &lt; 100000
+                </when>
+                <when test="code == '2'.toString()">
+                    AND a.amt_total between 100000 and 500000
+                </when>
+                <when test="code == '3'.toString()">
+                    AND a.amt_total between 500000 and 1000000
+                </when>
+                <when test="code == '4'.toString()">
+                    AND a.amt_total &gt; 1000000
+                </when>
+            </choose>
+
+        </if>
+        <if test="code != null and code != ''">
+            <choose>
+                <when test="code == '1'.toString()">
+                    AND a.amt_total &lt; 100000
+                </when>
+                <when test="code == '2'.toString()">
+                    AND a.amt_total between 100000 and 500000
+                </when>
+                <when test="code == '3'.toString()">
+                    AND a.amt_total between 500000 and 1000000
+                </when>
+                <when test="code == '4'.toString()">
+                    AND a.amt_total &gt; 1000000
+                </when>
+            </choose>
+        </if>
+        <if test="lightType != null and lightType != ''">
+            <choose>
+                <when test="lightType == '1'.toString()">
+                    and DATEDIFF(now(), a.rt_date) &gt; 3
+                </when>
+                <otherwise>
+                    and DATEDIFF(now(), a.rt_date) &lt;= 3
+                </otherwise>
+            </choose>
+        </if>
+    </select>
+
+    <select id="pageQueryPreWarnData" resultType="map" parameterType="map">
+        SELECT
+            c.id subId,
+            ts.title as indusName,
+            c.sub_code as subCode,
+            c.sub_name subName,
+            d.title unitName,
+            a.unit_desc unitDesc,
+            a.id,
+            IFNULL( jd.name_lead, ju.name_zrr ) nameLead,
+            IFNULL( jd.tel, ju.tel ) tel,
+            DATE_FORMAT( a.date_plan, '%Y-%m-%d' ) AS datePlan,
+            a.num1,
+            a.num2,
+            a.num3,
+            a.`status`,
+            a.status_conf statusConf,
+            b.title preName
+        FROM
+        sub_pre_new a
+        LEFT JOIN sub_pre_flow b ON a.pre_flow_id = b.id
+        LEFT JOIN sub_info c ON a.sub_id = c.id
+        LEFT JOIN j_unit d ON c.unit_id = d.id
+        LEFT JOIN j_depart jd ON jd.id = a.sub_depart_id
+        LEFT JOIN j_unit ju ON ju.id = a.sub_unit_id
+        LEFT JOIN t_systable ts ON ts.id = c.indus_kind
+        LEFT JOIN sub_manage e ON c.id = e.sub_id
+        AND e.logic_delete_flag = 0
+        LEFT JOIN sub_verify f ON f.sub_id = c.id
+        AND f.logic_delete_flag = 0
+        LEFT JOIN sub_source g ON g.sub_id = c.id
+        AND g.logic_delete_flag = 0
+        LEFT JOIN sub_manage sm ON sm.sub_id = c.id
+        AND sm.logic_delete_flag = 0
+        <where>
+            c.logic_delete_flag = 0
+            AND a.logic_delete_flag = 0
+            AND a.`status` = 1
+            and c.indus_kind in('210','99','2')
+            <if test="null != subjectId and '' != subjectId">
+                AND c.subject_id = #{subjectId}
+            </if>
+            <if test="code != null and code != ''">
+                <choose>
+                    <when test="code == '1'.toString()">
+                        AND c.amt_total &lt; 100000
+                    </when>
+                    <when test="code == '2'.toString()">
+                        AND c.amt_total between 100000 and 500000
+                    </when>
+                    <when test="code == '3'.toString()">
+                        AND c.amt_total between 500000 and 1000000
+                    </when>
+                    <when test="code == '4'.toString()">
+                        AND c.amt_total &gt; 1000000
+                    </when>
+                </choose>
+            </if>
+            <if test="lightType != null and lightType != ''">
+                <choose>
+                    <when test="lightType == '3'.toString()">
+                        AND ( status_conf = '2' AND DATE_ADD(a.date_plan,INTERVAL a.num2 DAY) &lt; a.date_confirm )
+                    </when>
+                    <when test="lightType == '2'.toString()">
+                        AND   ( status_conf = '1'  AND DATE_ADD(a.date_plan,INTERVAL a.num2 DAY) &lt; CURDATE()  AND  DATE_ADD(a.date_plan,INTERVAL a.num2 DAY) >= DATE_SUB(CURDATE(), INTERVAL 3 DAY) )
+                    </when>
+                    <when test="lightType == '1'.toString()">
+                        AND   ( status_conf = '1'  AND DATE_ADD(a.date_plan,INTERVAL a.num2 DAY) &lt; DATE_SUB(CURDATE(), INTERVAL 3 DAY) )
+                    </when>
+                </choose>
+            </if>
+            <if test="null == lightType or '' == lightType">
+                AND (
+                ( status_conf = '1' AND DATE_ADD( a.date_plan, INTERVAL a.num2 DAY ) &lt; NOW() )
+                OR ( status_conf = '2' AND DATE_ADD( a.date_plan, INTERVAL a.num2 DAY ) &lt; a.date_confirm )
+                )
+            </if>
+        </where>
+        GROUP BY
+        a.id
+    </select>
+</mapper>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/projects/mapper/SubRptContMapper.xml

@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.rtrh.projects.modules.projects.mapper.SubRptContMapper" >
+
+    <select id="pageQueryMonthWarnData" parameterType="map" resultType="map">
+        SELECT
+            a.id,
+            src.id monthId,
+            src.create_time,
+            a.sub_name subName,
+            ifnull( src.kj_month, #{yearMonth} ) AS kjMonth,
+            src.amt,
+            src.content,
+            src.num_bl numBl,
+            a.name_zrr nameZrr,
+            a.tel
+        FROM
+            sub_info a
+                LEFT JOIN sub_rpt_cont src ON src.sub_id = a.id
+                AND src.kind = '1'
+                AND src.kj_month LIKE #{yearMonth}
+                LEFT JOIN sub_source g ON g.sub_id = a.id
+                AND g.logic_delete_flag = 0
+                LEFT JOIN sub_manage e ON a.id = e.sub_id
+                AND e.logic_delete_flag = 0
+                LEFT JOIN sub_verify f ON f.sub_id = a.id
+                AND f.logic_delete_flag = 0
+                LEFT JOIN sub_manage sm ON sm.sub_id = a.id
+                AND sm.logic_delete_flag = 0
+        <where>
+            a.logic_delete_flag = 0
+            AND a.`status` = '7'
+            and a.indus_kind in('210','99','2')
+            <if test="null != subjectId and '' != subjectId">
+                AND a.subject_id = #{subjectId}
+            </if>
+            <if test="code != null and code != ''">
+                <choose>
+                    <when test="code == '1'.toString()">
+                        AND a.amt_total &lt; 100000
+                    </when>
+                    <when test="code == '2'.toString()">
+                        AND a.amt_total between 100000 and 500000
+                    </when>
+                    <when test="code == '3'.toString()">
+                        AND a.amt_total between 500000 and 1000000
+                    </when>
+                    <when test="code == '4'.toString()">
+                        AND a.amt_total &gt; 1000000
+                    </when>
+                </choose>
+            </if>
+            <if test="lightType != null and lightType != ''">
+                <choose>
+                    <when test="lightType == '3'.toString()">
+                        AND  src.create_time > #{date}
+                    </when>
+                    <when test="lightType == '2'.toString()">
+                        AND (src.id is NULL and TIMESTAMPDIFF(DAY,CONCAT(DATE_FORMAT(CURDATE(), '%Y-%m-'), '05'),now()) &lt;= 3)
+                    </when>
+                    <when test="lightType == '1'.toString()">
+                        AND (src.id is NULL and TIMESTAMPDIFF(DAY,CONCAT(DATE_FORMAT(CURDATE(), '%Y-%m-'), '05'),now()) > 3)
+                    </when>
+                </choose>
+            </if>
+            <if test="null == lightType or '' == lightType">
+                AND src.id IS NULL
+            </if>
+
+        </where>
+        GROUP BY
+            a.id
+    </select>
+    <select id="selectNewestMonthReportByIdAndKind" resultType="java.lang.String">
+        SELECT
+            content
+        FROM
+            sub_rpt_cont
+        WHERE
+            logic_delete_flag = 0
+          AND sub_id = #{subId}
+          AND kind = #{kind}
+          AND content IS NOT NULL
+        ORDER BY
+            kj_month DESC
+            LIMIT 1
+    </select>
+</mapper>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/projects/mapper/WorkbenchMapper.xml

@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.rtrh.projects.modules.projects.mapper.WorkbenchMapper" >
+
+	<!-- 获取待办数量 -->
+	<select id="getDaiBanNum" resultType="java.util.Map" statementType="CALLABLE" useCache="false">
+		call get_daiban_data(#{kind},#{loginName})
+	</select>
+
+	<!-- 工作台待办/已办数据列表 -->
+	<select id="workBenchTodoList" resultType="java.util.Map" statementType="CALLABLE" useCache="false">
+		call total_get_list1(#{kind},#{status},#{type},#{beginDate},#{endDate},#{subName},#{loginName},#{currStage})
+	</select>
+
+	<select id="getYbList"  resultType="java.util.Map" statementType="CALLABLE" useCache="false">
+	call total_get_yb_g_list(
+			#{varkind},#{varbegin},#{varend},#{vardesc},#{varstatus},#{varjsdd},#{varlogin},#{varpage},#{varnum},#{outtotal}
+			)
+	</select>
+
+	<select id="geYbFgwtList"  resultType="java.util.Map" statementType="CALLABLE" useCache="false">
+		call total_get_yb_g_list(
+			#{queryVO.varkind},#{queryVO.varbegin},#{queryVO.varend},#{queryVO.vardesc},#{queryVO.varstatus},#{queryVO.varjsdd},#{queryVO.varlogin},#{pageNo},#{pageSize},#{queryVO.outtotal,mode=OUT,jdbcType=INTEGER}
+			)
+	</select>
+
+	<select id="getWeekAndMonthAlarm" resultType="java.util.Map" statementType="CALLABLE" useCache="false">
+		call total_waring_data(#{loginName})
+	</select>
+
+	<select id="getStatisData" resultType="java.util.Map" statementType="CALLABLE" useCache="false">
+		call total_qt_gzt_data(#{kind},#{loginName})
+	</select>
+
+	<select id="getMonthAnalys" resultType="java.util.Map" statementType="CALLABLE" useCache="false">
+		call total_ydfx(#{kind},#{loginName})
+	</select>
+
+	<select id="callChangeSubInfo" parameterType="com.rtrh.projects.modules.projects.vo.SubChangeAgreeVO" statementType="CALLABLE" useCache="false">
+		call sp_changeOK(#{id},#{loginName},#{errorCode,mode=OUT,jdbcType=VARCHAR})
+	</select>
+
+	<select id="callSpTransKg" resultType="java.lang.String" statementType="CALLABLE" useCache="false">
+		call sp_trans_kg(#{subId},#{loginName},#{errorCode,mode=OUT,jdbcType=VARCHAR})
+	</select>
+
+	<select id="getHisOpinion" resultType="java.util.Map" statementType="CALLABLE" useCache="false">
+		call total_get_log_list(#{subId}, #{loginName},#{kind},#{spId})
+	</select>
+	<select id="selectProject" resultType="java.util.Map" statementType="CALLABLE" useCache="false">
+		call total_thb_zb1(#{varkind}, #{varxz},#{varhy},#{varsubkind},#{varlogin})
+	</select>
+    <select id="selectProjectSchedule" resultType="java.util.Map" statementType="CALLABLE" useCache="false">
+		call total_thb_sub1(#{varkind}, #{varxz},#{varhy},#{varsubkind},#{varlogin})
+	</select>
+
+	<select id="getProjectYearPlan" resultType="java.util.Map" statementType="CALLABLE" useCache="false">
+		call total_get_jh_list(#{year}, #{status}, #{xmlx}, #{xmxz}, #{hyfl}, #{unitName}, #{subName}, #{loginName}, #{jsdd},#{minMoney},#{maxMoney},#{isLock}, #{orderType},#{subid})
+	</select>
+	
+	
+	
+	<select id="pageProjectYearPlan" resultType="java.util.Map" statementType="CALLABLE" useCache="false">
+		call total_get_jh_list_pc(#{year}, #{status}, #{xmlx}, #{xmxz}, #{hyfl}, #{unitName}, #{subName}, #{loginName}, #{jsdd},#{minMoney},#{maxMoney},#{isLock}, #{orderType},#{subid}, #{pageInfo.pageNo}, #{pageInfo.pageSize}, #{pageInfo.totalCount,mode=OUT,jdbcType=INTEGER})
+	</select>
+
+
+
+
+
+
+	<select id="getMonthToPlanAmt" resultType="java.util.Map" statementType="CALLABLE" useCache="false">
+		call total_dp_tzydfx_data2(#{year}, #{xmlx}, #{kind}, #{loginName}, #{isZj}, #{jsdd}, #{minAmt}, #{maxAmt},#{kjMonth}, #{sortJh}, #{sortSj}, #{sortYc}, #{beginMonth}, #{endMonth}, #{hyfl}, #{zjly})
+	</select>
+
+</mapper>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/projects/po/NonFixedInvestment.hbm.xml

@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="com.rtrh.projects.modules.projects.po">
+    <class name="NonFixedInvestment" table="non_fixed_investment">
+        <id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
+        <property column="remark" name="remark" not-null="false" type="java.lang.String" />
+        <property column="unit_id" name="unitId" not-null="false" type="java.lang.String" />
+        <property column="main_id" name="mainId" not-null="false" type="java.lang.String" />
+        <property column="approve_id" name="approveId" not-null="false" type="java.lang.String" />
+        <property column="approve_departid" name="approveDepartid" not-null="false" type="java.lang.String" />
+        <property column="is_approve_fgw" name="isApproveFgw" not-null="false" type="java.lang.String" />
+        <property column="approve_departid2" name="approveDepartid2" not-null="false" type="java.lang.String" />
+        <property column="sub_code" name="subCode" not-null="false" type="java.lang.String" />
+        <property column="sub_name" name="subName" not-null="false" type="java.lang.String" />
+        <property column="kind" name="kind" not-null="false" type="java.lang.String" />
+        <property column="abc" name="abc" not-null="false" type="java.lang.String" />
+        <property column="is3_kg" name="is3Kg" not-null="false" type="java.lang.String" />
+        <property column="score" name="score" not-null="false" type="java.lang.Integer" />
+        <property column="sort" name="sort" not-null="false" type="java.lang.Integer" />
+        <property column="sort1" name="sort1" not-null="false" type="java.lang.Integer" />
+        <property column="camera_num" name="cameraNum" not-null="false" type="java.lang.Integer" />
+        <property column="employ_numbers" name="employNumbers" not-null="false" type="java.lang.Integer" />
+        <property column="assess_reason" name="assessReason" not-null="false" type="java.lang.String" />
+        <property column="indus_kind" name="indusKind" not-null="false" type="java.lang.String" />
+        <property column="longitude" name="longitude" not-null="false" type="java.lang.String" />
+        <property column="latitude" name="latitude" not-null="false" type="java.lang.String" />
+        <property column="work_space_img" name="workSpaceImg" not-null="false" type="java.lang.String" />
+        <property column="prop_kind" name="propKind" not-null="false" type="java.lang.String" />
+        <property column="amt_total" name="amtTotal" not-null="false" type="java.math.BigDecimal" />
+        <property column="amt_ly1" name="amtLy1" not-null="false" type="java.math.BigDecimal" />
+        <property column="amt_ly2" name="amtLy2" not-null="false" type="java.math.BigDecimal" />
+        <property column="amt_ly3" name="amtLy3" not-null="false" type="java.math.BigDecimal" />
+        <property column="amt_ly4" name="amtLy4" not-null="false" type="java.math.BigDecimal" />
+        <property column="amt_ly5" name="amtLy5" not-null="false" type="java.math.BigDecimal" />
+        <property column="amt_ly6" name="amtLy6" not-null="false" type="java.math.BigDecimal" />
+        <property column="amt_ly7" name="amtLy7" not-null="false" type="java.math.BigDecimal" />
+        <property column="amt_comptotal" name="amtComptotal" not-null="false" type="java.math.BigDecimal" />
+        <property column="amt_year" name="amtYear" not-null="false" type="java.math.BigDecimal" />
+        <property column="amt_comp" name="amtComp" not-null="false" type="java.math.BigDecimal" />
+        <property column="num_total" name="numTotal" not-null="false" type="java.math.BigDecimal" />
+        <property column="num_comp" name="numComp" not-null="false" type="java.math.BigDecimal" />
+        <property column="begin_date" name="beginDate" not-null="false" type="java.util.Date" />
+        <property column="end_date" name="endDate" not-null="false" type="java.util.Date" />
+        <property column="content" name="content" not-null="false" type="java.lang.String" />
+        <property column="addre" name="addre" not-null="false" type="java.lang.String" />
+        <property column="subject_id" name="subjectId" not-null="false" type="java.lang.String" />
+        <property column="kind_nature" name="kindNature" not-null="false" type="java.lang.String" />
+        <property column="is_rk" name="isRk" not-null="false" type="java.lang.String" />
+        <property column="is_hide" name="isHide" not-null="false" type="java.lang.String" />
+        <property column="name_zrr" name="nameZrr" not-null="false" type="java.lang.String" />
+        <property column="name_lead" name="nameLead" not-null="false" type="java.lang.String" />
+        <property column="tel_lead" name="telLead" not-null="false" type="java.lang.String" />
+        <property column="tel" name="tel" not-null="false" type="java.lang.String" />
+        <property column="conf_time" name="confTime" not-null="false" type="java.util.Date" />
+        <property column="status" name="status" not-null="false" type="java.lang.String" />
+        <property column="status_zd" name="statusZd" not-null="false" type="java.lang.String" />
+        <property column="status_sp" name="statusSp" not-null="false" type="java.lang.String" />
+        <property column="name_sp" name="nameSp" not-null="false" type="java.lang.String" />
+        <property column="date_sp" name="dateSp" not-null="false" type="java.util.Date" />
+        <property column="name_sp_fgw" name="nameSpFgw" not-null="false" type="java.lang.String" />
+        <property column="date_sp_fgw" name="dateSpFgw" not-null="false" type="java.util.Date" />
+        <property column="reason" name="reason" not-null="false" type="java.lang.String" />
+        <property column="reason_no_rk" name="reasonNoRk" not-null="false" type="java.lang.String" />
+        <property column="reason_no_amt" name="reasonNoAmt" not-null="false" type="java.lang.String" />
+        <property column="reason_no_kg" name="reasonNoKg" not-null="false" type="java.lang.String" />
+        <property column="reason_q" name="reasonq" not-null="false" type="java.lang.String" />
+        <property column="reason_jd" name="reasonJd" not-null="false" type="java.lang.String" />
+        <property column="status_jh" name="statusJh" not-null="false" type="java.lang.String" />
+        <property column="num_stage" name="numStage" not-null="false" type="java.lang.Integer" />
+        <property column="create_time" name="createTime" not-null="false" type="java.util.Date" />
+        <property column="create_user_id" name="createUserId" not-null="false" type="java.lang.String" />
+        <property column="last_update_userId" name="lastUpdateUserId" not-null="false" type="java.lang.String" />
+        <property column="status_fgw" name="statusFgw" not-null="false" type="java.lang.String" />
+        <property column="name_fgw" name="nameFgw" not-null="false" type="java.lang.String" />
+        <property column="date_fgw" name="dateFgw" not-null="false" type="java.util.Date" />
+        <property column="last_update_time" name="lastUpdateTime" not-null="false" type="java.util.Date" />
+        <property column="logic_delete_flag" name="logicDeleteFlag" not-null="false" type="java.lang.Integer" />
+    </class>
+</hibernate-mapping>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/projects/po/NonFixedInvestmentSource.hbm.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="com.rtrh.projects.modules.projects.po">
+    <class name="NonFixedInvestmentSource" table="non_fixed_investment_source">
+        <id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
+        <property column="sub_id" name="subId" not-null="false" type="java.lang.String" />
+        <property column="source_id" name="sourceId" not-null="false" type="java.lang.String" />
+        <property column="amt" name="amt" not-null="false" type="java.math.BigDecimal" />
+        <property column="amt_sj" name="amtSj" not-null="false" type="java.math.BigDecimal" />
+        <property column="amt_pay" name="amtPay" not-null="false" type="java.math.BigDecimal" />
+        <property column="pay_rate" name="payRate" not-null="false" type="java.lang.Integer" />
+        <property column="plan_date" name="planDate" not-null="false" type="java.util.Date" />
+        <property column="logic_delete_flag" name="logicDeleteFlag" not-null="false" type="java.lang.Integer" />
+    </class>
+</hibernate-mapping>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/projects/po/RptCont.hbm.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="com.rtrh.projects.modules.projects.po">
+	<class name="RptCont" table="sub_rpt_cont">
+		<id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
+		<property column="year" name="year" not-null="false" type="java.lang.String" />
+		<property column="week" name="week" not-null="false" type="java.lang.String" />
+		<property column="kind" name="kind" not-null="false" type="java.lang.String" />
+		<property column="begin_date" name="beginDate" not-null="false" type="java.util.Date" />
+		<property column="end_date" name="endDate" not-null="false" type="java.util.Date" />
+		<property column="sub_id" name="subId" not-null="false" type="java.lang.String" />
+		<property column="sub_plan_id" name="subPlanId" not-null="false" type="java.lang.String" />
+		<property column="num_bl" name="numBl" not-null="false" type="java.math.BigDecimal" />
+		<property column="amt" name="amt" not-null="false" type="java.math.BigDecimal" />
+	<!--	<property column="assign_amt" name="assignAmt" not-null="false" type="java.math.BigDecimal" />-->
+		<property column="amt_last" name="amtLast" not-null="false" type="java.math.BigDecimal" />
+		<property column="amt_rt" name="amtRt" not-null="false" type="java.math.BigDecimal" />
+		<property column="content" name="content" not-null="false" type="java.lang.String" />
+		<property column="reason" name="reason" not-null="false" type="java.lang.String" />
+		<property column="kj_month" name="kjMonth" not-null="false" type="java.lang.String" />
+        <property column="create_time" name="createTime" not-null="false" type="java.util.Date" />
+        <property column="create_user_id" name="createUserId" not-null="false" type="java.lang.String" />
+        <property column="last_update_userId" name="lastUpdateUserId" not-null="false" type="java.lang.String" />
+        <property column="last_update_time" name="lastUpdateTime" not-null="false" type="java.util.Date" />
+        <property column="logic_delete_flag" name="logicDeleteFlag" not-null="false" type="java.lang.Integer" />
+	</class>
+</hibernate-mapping>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/projects/po/SecUserSub.hbm.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="com.rtrh.projects.modules.projects.po">
+	<class name="SecUserSub" table="sec_user_sub">
+		<id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
+        <property column="user_id" name="userId" not-null="false" type="java.lang.String" />
+        <property column="sub_id" name="subId" not-null="false" type="java.lang.String" />
+        <property column="logic_delete_flag" name="logicDeleteFlag" not-null="false" type="java.lang.Integer" />
+	</class>
+</hibernate-mapping>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/projects/po/SubAerialImage.hbm.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="com.rtrh.projects.modules.projects.po">
+    <class name="SubAerialImage" table="sub_aerial_image">
+        <id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
+        <property column="sub_id" name="subId" not-null="false" type="java.lang.String" />
+        <property name="aerialDate" type="java.util.Date">
+        	<column name="aerial_date" not-null="false" sql-type="date" />
+        </property>
+        <property column="img_id" name="imgId" not-null="false" type="java.lang.String" />
+        <property column="type" name="type" not-null="false" type="java.lang.String" />
+        <property column="remark" name="remark" not-null="false" type="java.lang.String" />
+        <property column="create_time" name="createTime" not-null="false" type="java.util.Date" />
+        <property column="create_user_id" name="createUserId" not-null="false" type="java.lang.String" />
+        <property column="last_update_userId" name="lastUpdateUserId" not-null="false" type="java.lang.String" />
+        <property column="last_update_time" name="lastUpdateTime" not-null="false" type="java.util.Date" />
+        <property column="logic_delete_flag" name="logicDeleteFlag" not-null="false" type="java.lang.Integer" />
+    </class>
+</hibernate-mapping>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/projects/po/SubAmtPlan.hbm.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="com.rtrh.projects.modules.projects.po">
+	<class name="SubAmtPlan" table="sub_amtplan">
+		<id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
+        <property column="sub_id" name="subId" not-null="false" type="java.lang.String" />
+        <property column="y_month" name="ymonth" not-null="false" type="java.lang.String" />
+        <property column="amt" name="amt" not-null="false" type="java.math.BigDecimal" />
+        <property column="assign_amt" name="assignAmt" not-null="false" type="java.math.BigDecimal" />
+        <property column="assign_remark" name="assignRemark" not-null="false" type="java.lang.String" />
+        <property column="remark" name="remark" not-null="false" type="java.lang.String" />
+        <property column="is_lock" name="isLock" not-null="false" type="java.lang.String" />
+        <property column="create_time" name="createTime" not-null="false" type="java.util.Date" />
+        <property column="create_user_id" name="createUserId" not-null="false" type="java.lang.String" />
+        <property column="last_update_userId" name="lastUpdateUserId" not-null="false" type="java.lang.String" />
+        <property column="last_update_time" name="lastUpdateTime" not-null="false" type="java.util.Date" />
+        <property column="logic_delete_flag" name="logicDeleteFlag" not-null="false" type="java.lang.Integer" />
+	</class>
+</hibernate-mapping>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/projects/po/SubCamera.hbm.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="com.rtrh.projects.modules.projects.po">
+    <class name="SubCamera" table="sub_camera">
+        <id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
+        <property column="sub_id" name="subId" not-null="false" type="java.lang.String" />
+        <property column="code" name="code" not-null="false" type="java.lang.String" />
+        <property column="encode_device_code" name="encodeDeviceCode" not-null="false" type="java.lang.String" />
+        <property column="title" name="title" not-null="false" type="java.lang.String" />
+        <property column="longitude" name="longitude" not-null="false" type="java.lang.String" />
+        <property column="latitude" name="latitude" not-null="false" type="java.lang.String" />
+        <property column="remark" name="remark" not-null="false" type="java.lang.String" />
+        <property column="create_time" name="createTime" not-null="false" type="java.util.Date" />
+        <property column="is_show" name="isShow" not-null="false" type="java.lang.String" />
+        <property column="create_user_id" name="createUserId" not-null="false" type="java.lang.String" />
+        <property column="last_update_userId" name="lastUpdateUserId" not-null="false" type="java.lang.String" />
+        <property column="last_update_time" name="lastUpdateTime" not-null="false" type="java.util.Date" />
+        <property column="logic_delete_flag" name="logicDeleteFlag" not-null="false" type="java.lang.Integer" />
+    </class>
+</hibernate-mapping>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/projects/po/SubChangeSource.hbm.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="com.rtrh.projects.modules.projects.po">
+    <class name="SubChangeSource" table="sub_change_source">
+        <id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
+        <property column="sub_id" name="subId" not-null="false" type="java.lang.String" />
+        <property column="sub_change_id" name="subChangeId" not-null="false" type="java.lang.String" />
+        <property column="source_id" name="sourceId" not-null="false" type="java.lang.String" />
+        <property column="amt" name="amt" not-null="false" type="java.math.BigDecimal" />
+        <property column="logic_delete_flag" name="logicDeleteFlag" not-null="false" type="java.lang.Integer" />
+    </class>
+</hibernate-mapping>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/projects/po/SubCompleted.hbm.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="com.rtrh.projects.modules.projects.po">
+	<class name="SubCompleted" table="sub_completed">
+		<id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
+        <property column="name_sqr" name="nameSqr" not-null="false" type="java.lang.String" />
+        <property column="sub_id" name="subId" not-null="false" type="java.lang.String" />
+        <property column="subplan_id" name="subplanId" not-null="false" type="java.lang.String" />
+        <property column="sub_status" name="subStatus" not-null="false" type="java.lang.String" />
+        <property column="content" name="content" not-null="false" type="java.lang.String" />
+        <property column="kind" name="kind" not-null="false" type="java.lang.String" />
+        <property column="amt_jh" name="amtJh" not-null="false" type="java.math.BigDecimal" />
+        <property column="amt_sj" name="amtSj" not-null="false" type="java.math.BigDecimal" />
+        <property column="amt_total" name="amtTotal" not-null="false" type="java.math.BigDecimal" />
+        <property column="reason" name="reason" not-null="false" type="java.lang.String" />
+        <property column="date_sq" name="dateSq" not-null="false" type="java.util.Date" />
+        <property column="status" name="status" not-null="false" type="java.lang.String" />
+        <property column="status_sp" name="statusSp" not-null="false" type="java.lang.String" />
+        <property column="name_sp" name="nameSp" not-null="false" type="java.lang.String" />
+        <property column="date_sp" name="dateSp" not-null="false" type="java.util.Date" />
+       <property column="create_time" name="createTime" not-null="false" type="java.util.Date" />
+        <property column="create_user_id" name="createUserId" not-null="false" type="java.lang.String" />
+        <property column="last_update_userId" name="lastUpdateUserId" not-null="false" type="java.lang.String" />
+        <property column="last_update_time" name="lastUpdateTime" not-null="false" type="java.util.Date" />
+        <property column="logic_delete_flag" name="logicDeleteFlag" not-null="false" type="java.lang.Integer" />
+	</class>
+</hibernate-mapping>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/projects/po/SubCompletedPic.hbm.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="com.rtrh.projects.modules.projects.po">
+	<class name="SubCompletedPic" table="sub_completed_pic">
+		<id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
+        <property column="subplan_id" name="subplanId" not-null="false" type="java.lang.String" />
+        <property column="sub_id" name="subId" not-null="false" type="java.lang.String" />
+        <property column="sub_completed_id" name="subCompletedId" not-null="false" type="java.lang.String" />
+        <property column="pic_addre" name="picAddre" not-null="false" type="java.lang.String" />
+        <property column="pic_name" name="picName" not-null="false" type="java.lang.String" />
+        <property column="name_scr" name="nameScr" not-null="false" type="java.lang.String" />
+        <property column="date_sc" name="dateSc" not-null="false" type="java.util.Date" />
+        <property column="kind" name="kind" not-null="false" type="java.lang.String" />
+        <property column="logic_delete_flag" name="logicDeleteFlag" not-null="false" type="java.lang.Integer" />
+	</class>
+</hibernate-mapping>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/projects/po/SubConcern.hbm.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="com.rtrh.projects.modules.projects.po">
+	<class name="SubConcern" table="sub_concern">
+		<id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
+        <property column="user_id" name="userId" not-null="false" type="java.lang.String" />
+        <property column="sub_id" name="subId" not-null="false" type="java.lang.String" />
+	</class>
+</hibernate-mapping>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/projects/po/SubFix.hbm.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="com.rtrh.projects.modules.projects.po">
+    <class name="SubFix" table="sub_fix">
+        <id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
+        <property column="sub_id" name="subId" not-null="false" type="java.lang.String" />
+        <property column="year" name="year" not-null="false" type="java.lang.String" />
+        <property column="cat" name="cat" not-null="false" type="java.lang.String" />
+        <property column="status" name="status" not-null="false" type="java.lang.String" />
+        <property column="create_time" name="createTime" not-null="false" type="java.util.Date" />
+        <property column="create_user_id" name="createUserId" not-null="false" type="java.lang.String" />
+    </class>
+</hibernate-mapping>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/projects/po/SubInfo.hbm.xml

@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="com.rtrh.projects.modules.projects.po">
+	<class name="SubInfo" table="sub_info">
+		<id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
+        <property column="remark" name="remark" not-null="false" type="java.lang.String" />
+        <property column="unit_id" name="unitId" not-null="false" type="java.lang.String" />
+        <property column="main_id" name="mainId" not-null="false" type="java.lang.String" />
+        <property column="approve_id" name="approveId" not-null="false" type="java.lang.String" />
+        <property column="approve_departid" name="approveDepartid" not-null="false" type="java.lang.String" />
+        <property column="is_approve_fgw" name="isApproveFgw" not-null="false" type="java.lang.String" />
+        <property column="approve_departid2" name="approveDepartid2" not-null="false" type="java.lang.String" />
+        <property column="sub_code" name="subCode" not-null="false" type="java.lang.String" />
+        <property column="sub_name" name="subName" not-null="false" type="java.lang.String" />
+        <property column="kind" name="kind" not-null="false" type="java.lang.String" />
+        <property column="abc" name="abc" not-null="false" type="java.lang.String" />
+        <property column="is3_kg" name="is3Kg" not-null="false" type="java.lang.String" />
+        <property column="score" name="score" not-null="false" type="java.lang.Integer" />
+        <property column="sort" name="sort" not-null="false" type="java.lang.Integer" />
+        <property column="sort1" name="sort1" not-null="false" type="java.lang.Integer" />
+        <property column="camera_num" name="cameraNum" not-null="false" type="java.lang.Integer" />
+        <property column="employ_numbers" name="employNumbers" not-null="false" type="java.lang.Integer" />
+        <property column="assess_reason" name="assessReason" not-null="false" type="java.lang.String" />
+        <property column="indus_kind" name="indusKind" not-null="false" type="java.lang.String" />
+        <property column="longitude" name="longitude" not-null="false" type="java.lang.String" />
+        <property column="latitude" name="latitude" not-null="false" type="java.lang.String" />
+        <property column="work_space_img" name="workSpaceImg" not-null="false" type="java.lang.String" />
+        <property column="prop_kind" name="propKind" not-null="false" type="java.lang.String" />
+        <property column="amt_total" name="amtTotal" not-null="false" type="java.math.BigDecimal" />
+        <property column="amt_ly1" name="amtLy1" not-null="false" type="java.math.BigDecimal" />
+        <property column="amt_ly2" name="amtLy2" not-null="false" type="java.math.BigDecimal" />
+        <property column="amt_ly3" name="amtLy3" not-null="false" type="java.math.BigDecimal" />
+        <property column="amt_ly4" name="amtLy4" not-null="false" type="java.math.BigDecimal" />
+        <property column="amt_ly5" name="amtLy5" not-null="false" type="java.math.BigDecimal" />
+        <property column="amt_ly6" name="amtLy6" not-null="false" type="java.math.BigDecimal" />
+        <property column="amt_ly7" name="amtLy7" not-null="false" type="java.math.BigDecimal" />
+        <property column="amt_comptotal" name="amtComptotal" not-null="false" type="java.math.BigDecimal" />
+        <property column="amt_year" name="amtYear" not-null="false" type="java.math.BigDecimal" />
+        <property column="amt_comp" name="amtComp" not-null="false" type="java.math.BigDecimal" />
+        <property column="num_total" name="numTotal" not-null="false" type="java.math.BigDecimal" />
+        <property column="num_comp" name="numComp" not-null="false" type="java.math.BigDecimal" />
+        <property column="begin_date" name="beginDate" not-null="false" type="java.util.Date" />
+        <property column="end_date" name="endDate" not-null="false" type="java.util.Date" />
+        <property column="content" name="content" not-null="false" type="java.lang.String" />
+        <property column="addre" name="addre" not-null="false" type="java.lang.String" />
+        <property column="subject_id" name="subjectId" not-null="false" type="java.lang.String" />
+        <property column="kind_nature" name="kindNature" not-null="false" type="java.lang.String" />
+        <property column="is_rk" name="isRk" not-null="false" type="java.lang.String" />
+        <property column="is_hide" name="isHide" not-null="false" type="java.lang.String" />
+        <property column="name_zrr" name="nameZrr" not-null="false" type="java.lang.String" />
+        <property column="name_lead" name="nameLead" not-null="false" type="java.lang.String" />
+        <property column="tel_lead" name="telLead" not-null="false" type="java.lang.String" />
+        <property column="tel" name="tel" not-null="false" type="java.lang.String" />
+        <property column="conf_time" name="confTime" not-null="false" type="java.util.Date" />
+        <property column="status" name="status" not-null="false" type="java.lang.String" />
+            <property name="statusZd" type="java.lang.String">
+                    <column name="status_zd" default="0"/>
+            </property>
+            <property name="statusZj" type="java.lang.String">
+                    <column name="status_zj" default="1"/>
+            </property>
+            <property name="stateFix" type="java.lang.String">
+                    <column name="state_fix" default="1"/>
+            </property>
+            <property name="isFix" type="java.lang.String">
+                    <column name="is_fix" default="0"/>
+            </property>
+        <property column="status_sp" name="statusSp" not-null="false" type="java.lang.String" />
+        <property column="name_sp" name="nameSp" not-null="false" type="java.lang.String" />
+        <property column="date_sp" name="dateSp" not-null="false" type="java.util.Date" />
+        <property column="name_sp_fgw" name="nameSpFgw" not-null="false" type="java.lang.String" />
+        <property column="date_sp_fgw" name="dateSpFgw" not-null="false" type="java.util.Date" />
+        <property column="reason" name="reason" not-null="false" type="java.lang.String" />
+        <property column="reason_no_rk" name="reasonNoRk" not-null="false" type="java.lang.String" />
+        <property column="reason_no_amt" name="reasonNoAmt" not-null="false" type="java.lang.String" />
+        <property column="reason_no_kg" name="reasonNoKg" not-null="false" type="java.lang.String" />
+        <property column="reason_q" name="reasonq" not-null="false" type="java.lang.String" />
+        <property column="reason_jd" name="reasonJd" not-null="false" type="java.lang.String" />
+        <property column="status_jh" name="statusJh" not-null="false" type="java.lang.String" />
+        <property column="num_stage" name="numStage" not-null="false" type="java.lang.Integer" />
+        <property column="create_time" name="createTime" not-null="false" type="java.util.Date" />
+        <property column="create_user_id" name="createUserId" not-null="false" type="java.lang.String" />
+        <property column="last_update_userId" name="lastUpdateUserId" not-null="false" type="java.lang.String" />
+        <property column="status_fgw" name="statusFgw" not-null="false" type="java.lang.String" />
+        <property column="name_fgw" name="nameFgw" not-null="false" type="java.lang.String" />
+        <property column="date_fgw" name="dateFgw" not-null="false" type="java.util.Date" />
+        <property column="last_update_time" name="lastUpdateTime" not-null="false" type="java.util.Date" />
+        <property column="logic_delete_flag" name="logicDeleteFlag" not-null="false" type="java.lang.Integer" />
+        <property column="yb_content" name="ybContent" not-null="false" type="java.lang.String" />
+        <property column="progress" name="progress" not-null="false" type="java.lang.String" />
+        <property column="unit_desc" name="unitDesc" not-null="false" type="java.lang.String" />
+        <property column="indus_name" name="indusName" not-null="false" type="java.lang.String" />
+
+        <property column="subject_name" name="subjectName" not-null="false" type="java.lang.String" />
+        <property column="rt_date" name="rtDate" not-null="false" type="java.util.Date" />
+        <property column="cb_status" name="cbStatus" not-null="false" type="java.lang.String" />
+        <property column="qy_date" name="qyDate" not-null="false" type="java.util.Date" />
+        <property column="xj_date" name="xjDate" not-null="false" type="java.util.Date" />
+        <property column="zj_date" name="zjDate" not-null="false" type="java.util.Date" />
+        <property column="tc_date" name="tcDate" not-null="false" type="java.util.Date" />
+        <property column="cb_num" name="cbNum" not-null="false" type="java.lang.Integer" />
+        <property column="xj_num" name="xjNum" not-null="false" type="java.lang.Integer" />
+        <property column="zj_num" name="zjNum" not-null="false" type="java.lang.Integer" />
+        <property column="rg_date" name="rgDate" not-null="false" type="java.util.Date" />
+        <property column="create_user_name" name="createUserName" not-null="false" type="java.lang.String" />
+        <property column="last_update_user_name" name="lastUpdateUserName" not-null="false" type="java.lang.String" />
+        <property column="status_lamp" name="statusLamp" not-null="false" type="java.lang.String" />
+	</class>
+</hibernate-mapping>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/projects/po/SubInfoExportField.hbm.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="com.rtrh.projects.modules.projects.po">
+	<class name="SubInfoExportField" table="sub_export_field">
+		<id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
+        <property column="user_id" name="userId" not-null="false" type="java.lang.String" />
+        <property name="fields" type="java.lang.String" >
+        	<column name="fileds" sql-type="text" not-null="false" />
+        </property>
+        <property column="create_time" name="createTime" not-null="false" type="java.util.Date" />
+	</class>
+</hibernate-mapping>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/projects/po/SubJudge.hbm.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="com.rtrh.projects.modules.projects.po">
+    <class name="SubJudge" table="sub_judge">
+        <id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
+        <property column="sub_id" name="subId" not-null="false" type="java.lang.String" />
+        <property column="is_do" name="isDo" not-null="false" type="java.lang.String" />
+        <property column="is_form" name="isForm" not-null="false" type="java.lang.String" />
+        <property column="is_run" name="isRun" not-null="false" type="java.lang.String" />
+        <property column="remark" name="remark" not-null="false" type="java.lang.String" />
+        <property column="create_time" name="createTime" not-null="false" type="java.util.Date" />
+        <property column="create_user_id" name="createUserId" not-null="false" type="java.lang.String" />
+    </class>
+</hibernate-mapping>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/projects/po/SubKey.hbm.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="com.rtrh.projects.modules.projects.po">
+    <class name="SubKey" table="sub_key">
+        <id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
+        <property column="sub_id" name="subId" not-null="false" type="java.lang.String" />
+        <property column="year" name="year" not-null="false" type="java.lang.String" />
+        <property column="cat" name="cat" not-null="false" type="java.lang.String" />
+        <property column="create_time" name="createTime" not-null="false" type="java.util.Date" />
+        <property column="create_user_id" name="createUserId" not-null="false" type="java.lang.String" />
+    </class>
+</hibernate-mapping>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/projects/po/SubLabel.hbm.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="com.rtrh.projects.modules.projects.po">
+    <class name="SubLabel" table="sub_label">
+        <id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
+        <property column="sub_id" name="subId" not-null="false" type="java.lang.String" />
+        <property column="label_id" name="labelId" not-null="false" type="java.lang.String" />
+        <property column="year" name="year" not-null="false" type="java.lang.String" />
+        <property column="cat" name="cat" not-null="false" type="java.lang.String" />
+        <property column="logic_delete_flag" name="logicDeleteFlag" not-null="false" type="java.lang.Integer" />
+    </class>
+</hibernate-mapping>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/projects/po/SubLog.hbm.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="com.rtrh.projects.modules.projects.po">
+	<class name="SubLog" table="sub_log">
+		<id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
+        <property column="kind" name="kind" not-null="false" type="java.lang.String" />
+        <property column="sub_id" name="subId" not-null="false" type="java.lang.String" />
+        <property column="reason" name="reason" not-null="false" type="java.lang.String" />
+        <property column="status_sp" name="statusSp" not-null="false" type="java.lang.String" />
+        <property column="name_sp" name="nameSp" not-null="false" type="java.lang.String" />
+        <property column="sub_sp_id" name="subSpId" not-null="false" type="java.lang.String" />
+        <property column="date_sp" name="dateSp" not-null="false" type="java.util.Date" />
+        <property column="last_update_time" name="lastUpdateTime" not-null="false" type="java.util.Date" />
+        <property column="last_update_userId" name="lastUpdateUserId" not-null="false" type="java.lang.String" />
+	</class>
+</hibernate-mapping>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/projects/po/SubMajor.hbm.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="com.rtrh.projects.modules.projects.po">
+    <class name="SubMajor" table="sub_major">
+        <id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
+        <property column="sub_id" name="subId" not-null="false" type="java.lang.String" />
+        <property column="major_file" name="majorFile" not-null="false" type="java.lang.String" />
+        <property column="major_num" name="majorNum" not-null="false" type="java.lang.Integer" />
+        <property column="major_total" name="majorTotal" not-null="false" type="java.lang.Integer" />
+        <property column="is_destruction" name="isDestruction" not-null="false" type="java.lang.Integer" />
+        <property column="apply_code" name="applyCode" not-null="false" type="java.lang.String" />
+    </class>
+</hibernate-mapping>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/projects/po/SubMajorMonth.hbm.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="com.rtrh.projects.modules.projects.po">
+	<class name="SubMajorMonth" table="sub_major_month">
+		<id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
+        <property column="sub_id" name="subId" not-null="false" type="java.lang.String" />
+        <property column="y_month" name="ymonth" not-null="false" type="java.lang.String" />
+        <property column="amt" name="amt" not-null="false" type="java.math.BigDecimal" />
+        <property column="cat" name="cat" not-null="false" type="java.lang.Integer" />
+        <property column="remark" name="remark" not-null="false" type="java.lang.String" />
+        <property column="create_time" name="createTime" not-null="false" type="java.util.Date" />
+        <property column="create_user_id" name="createUserId" not-null="false" type="java.lang.String" />
+        <property column="last_update_userId" name="lastUpdateUserId" not-null="false" type="java.lang.String" />
+        <property column="last_update_time" name="lastUpdateTime" not-null="false" type="java.util.Date" />
+        <property column="logic_delete_flag" name="logicDeleteFlag" not-null="false" type="java.lang.Integer" />
+	</class>
+</hibernate-mapping>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/projects/po/SubMajorYear.hbm.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="com.rtrh.projects.modules.projects.po">
+	<class name="SubMajorYear" table="sub_major_year">
+		<id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
+        <property column="sub_id" name="subId" not-null="false" type="java.lang.String" />
+        <property column="year" name="year" not-null="false" type="java.lang.String" />
+        <property column="amt" name="amt" not-null="false" type="java.math.BigDecimal" />
+        <property column="cat" name="cat" not-null="false" type="java.lang.Integer" />
+        <property column="remark" name="remark" not-null="false" type="java.lang.String" />
+        <property column="create_time" name="createTime" not-null="false" type="java.util.Date" />
+        <property column="create_user_id" name="createUserId" not-null="false" type="java.lang.String" />
+        <property column="last_update_userId" name="lastUpdateUserId" not-null="false" type="java.lang.String" />
+        <property column="last_update_time" name="lastUpdateTime" not-null="false" type="java.util.Date" />
+        <property column="logic_delete_flag" name="logicDeleteFlag" not-null="false" type="java.lang.Integer" />
+	</class>
+</hibernate-mapping>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/projects/po/SubManage.hbm.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="com.rtrh.projects.modules.projects.po">
+	<class name="SubManage" table="sub_manage">
+		<id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
+        <property column="sub_id" name="subId" not-null="false" type="java.lang.String" />
+        <property column="manage_id" name="manageId" not-null="false" type="java.lang.String" />
+        <property column="depart_id" name="departId" not-null="false" type="java.lang.String" />
+        <property column="name_lead" name="nameLead" not-null="false" type="java.lang.String" />
+        <property column="tel" name="tel" not-null="false" type="java.lang.String" />
+        <property column="logic_delete_flag" name="logicDeleteFlag" not-null="false" type="java.lang.Integer" />
+	</class>
+</hibernate-mapping>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/projects/po/SubPlan.hbm.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="com.rtrh.projects.modules.projects.po">
+	<class name="SubPlan" table="sub_plan">
+		<id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
+        <property column="remark" name="remark" not-null="false" type="java.lang.String" />
+        <property column="sub_id" name="subId" not-null="false" type="java.lang.String" />
+        <property column="amt_jh" name="amtJh" not-null="false" type="java.math.BigDecimal" />
+        <property column="num_rate" name="numRate" not-null="false" type="java.math.BigDecimal" />
+        <property column="end_date" name="endDate" not-null="false" type="java.util.Date" />
+        <property column="content" name="content" not-null="false" type="java.lang.String" />
+        <property column="status_sp" name="statusSp" not-null="false" type="java.lang.String" />
+        <property column="name_sp" name="nameSp" not-null="false" type="java.lang.String" />
+        <property column="date_sp" name="dateSp" not-null="false" type="java.util.Date" />
+        <property column="logic_delete_flag" name="logicDeleteFlag" not-null="false" type="java.lang.Integer" />
+	</class>
+</hibernate-mapping>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/projects/po/SubPre.hbm.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="com.rtrh.projects.modules.projects.po">
+    <class name="SubPre" table="sub_pre">
+        <id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
+        <property column="sys_id" name="sysId" not-null="false" type="java.lang.String" />
+        <property column="kind" name="kind" not-null="false" type="java.lang.String" />
+        <property column="sub_id" name="subId" not-null="false" type="java.lang.String" />
+        <property column="status" name="status" not-null="false" type="java.lang.String" />
+        <property column="sub_unit" name="subUnit" not-null="false" type="java.lang.String" />
+        <property column="sort_index" name="sortIndex" not-null="false" type="java.lang.Integer" />
+        <property column="appr_no" name="apprNo" not-null="false" type="java.lang.String" />
+        <property column="file_name" name="fileName" not-null="false" type="java.lang.String" />
+        <property column="file_addre" name="fileAddre" not-null="false" type="java.lang.String" />
+        <property column="file_type" name="fileType" not-null="false" type="java.lang.String" />
+        <property column="date_plan" name="datePlan" not-null="false" type="java.util.Date" />
+        <property column="date_confirm" name="dateConfirm" not-null="false" type="java.util.Date" />
+        <property column="logic_delete_flag" name="logicDeleteFlag" not-null="false" type="java.lang.Integer" />
+    </class>
+</hibernate-mapping>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/projects/po/SubPreFile.hbm.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="com.rtrh.projects.modules.projects.po">
+    <class name="SubPreFile" table="sub_pre_file">
+        <id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
+        <property column="file_name" name="fileName" not-null="false" type="java.lang.String" />
+        <property column="file_addre" name="fileAddre" not-null="false" type="java.lang.String" />
+        <property column="file_type" name="fileType" not-null="false" type="java.lang.String" />
+        <property column="pre_id" name="preId" not-null="false" type="java.lang.String" />
+        <property column="sub_id" name="subId" not-null="false" type="java.lang.String" />
+
+
+        <property column="create_time" name="createTime" not-null="false" type="java.util.Date" />
+        <property column="create_user_id" name="createUserId" not-null="false" type="java.lang.String" />
+        <property column="last_update_userId" name="lastUpdateUserId" not-null="false" type="java.lang.String" />
+        <property column="last_update_time" name="lastUpdateTime" not-null="false" type="java.util.Date" />
+        <property column="logic_delete_flag" name="logicDeleteFlag" not-null="false" type="java.lang.Integer" />
+    </class>
+</hibernate-mapping>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/projects/po/SubPreFlow.hbm.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="com.rtrh.projects.modules.projects.po">
+	<class name="SubPreFlow" table="sub_pre_flow">
+		<id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
+        <property column="rpt_date" name="rptDate" not-null="false" type="java.util.Date" />
+        <property column="title" name="title" not-null="false" type="java.lang.String" />
+        <property column="num_stage" name="numStage" not-null="false" type="java.lang.Integer" />
+        <property column="num1" name="num1" not-null="false" type="java.lang.Integer" />
+        <property column="num2" name="num2" not-null="false" type="java.lang.Integer" />
+        <property column="sort" name="sort" not-null="false" type="java.lang.Integer" />
+        <property column="sp_unit_desc" name="spUnitDesc" not-null="false" type="java.lang.String" />
+        <property column="description" name="description" not-null="false" type="java.lang.String" />
+        <property column="expound" name="expound" not-null="false" type="java.lang.String" />
+        <property column="depart_desc" name="departDesc" not-null="false" type="java.lang.String" />
+        <property column="remark" name="remark" not-null="false" type="java.lang.String" />
+        <property column="logic_delete_flag" name="logicDeleteFlag" not-null="false" type="java.lang.Integer" />
+	</class>
+</hibernate-mapping>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/projects/po/SubPreFlowUnit.hbm.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="com.rtrh.projects.modules.projects.po">
+	<class name="SubPreFlowUnit" table="sub_pre_flow_unit">
+		<id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
+        <property column="flow_id" name="flowId" not-null="false" type="java.lang.String" />
+        <property column="subject_id" name="subjectId" not-null="false" type="java.lang.String" />
+        <property column="indus_kind" name="indusKind" not-null="false" type="java.lang.String" />
+        <property column="unit_id" name="unitId" not-null="false" type="java.lang.String" />
+        <property column="depart_id" name="departId" not-null="false" type="java.lang.String" />
+	</class>
+</hibernate-mapping>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/projects/po/SubPreLog.hbm.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="com.rtrh.projects.modules.projects.po">
+    <class name="SubPreLog" table="sub_pre_log">
+        <id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
+        <property column="sub_id" name="subId" not-null="false" type="java.lang.String" />
+        <property column="flow_id" name="flowId" not-null="false" type="java.lang.String" />
+        <property column="op_date" name="opDate" not-null="false" type="java.util.Date" />
+        <property column="content" name="content" not-null="false" type="java.lang.String" />
+        <property column="cat" name="cat" not-null="false" type="java.lang.String" />
+        <property column="remark" name="remark" not-null="false" type="java.lang.String" />
+        <property column="create_time" name="createTime" not-null="false" type="java.util.Date" />
+    </class>
+</hibernate-mapping>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/projects/po/SubPreNew.hbm.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="com.rtrh.projects.modules.projects.po">
+	<class name="SubPreNew" table="sub_pre_new">
+		<id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
+        <property column="sub_id" name="subId" not-null="false" type="java.lang.String" />
+        <property column="kind" name="kind" not-null="false" type="java.lang.String" />
+        <property column="pre_flow_id" name="preFlowId" not-null="false" type="java.lang.String" />
+        <property column="status" name="status" not-null="false" type="java.lang.String" />
+        <property column="num_stage" name="numStage" not-null="false" type="java.lang.Integer" />
+        <property column="sub_unit_id" name="subUnitId" not-null="false" type="java.lang.String" />
+        <property column="unit_desc" name="unitDesc" not-null="false" type="java.lang.String" />
+        <property column="sub_depart_id" name="subDepartId" not-null="false" type="java.lang.String" />
+        <property column="depart_desc" name="departDesc" not-null="false" type="java.lang.String" />
+        <property column="status_conf" name="statusConf" not-null="false" type="java.lang.String" />
+        <property column="transactors" name="transactors" not-null="false" type="java.lang.String" />
+        <property column="transactors_phone" name="transactorsPhone" not-null="false" type="java.lang.String" />
+        <property column="user_th" name="userTh" not-null="false" type="java.lang.String" />
+        <property column="date_th" name="dateTh" not-null="false" type="java.util.Date" />
+        <property column="date_plan" name="datePlan" not-null="false" type="java.util.Date" />
+        <property column="date_confirm" name="dateConfirm" not-null="false" type="java.util.Date" />
+        <property column="appr_no" name="apprNo" not-null="false" type="java.lang.String" />
+        <property column="file_name" name="fileName" not-null="false" type="java.lang.String" />
+        <property column="file_addre" name="fileAddre" not-null="false" type="java.lang.String" />
+        <property column="file_type" name="fileType" not-null="false" type="java.lang.String" />
+        <property column="num1" name="num1" not-null="false" type="java.lang.Integer" />
+        <property column="num2" name="num2" not-null="false" type="java.lang.Integer" />
+        <property column="num3" name="num3" not-null="false" type="java.lang.Integer" />
+        <property column="create_time" name="createTime" not-null="false" type="java.util.Date" />
+        <property column="create_user_id" name="createUserId" not-null="false" type="java.lang.String" />
+        <property column="last_update_userId" name="lastUpdateUserId" not-null="false" type="java.lang.String" />
+        <property column="last_update_time" name="lastUpdateTime" not-null="false" type="java.util.Date" />
+        <property column="logic_delete_flag" name="logicDeleteFlag" not-null="false" type="java.lang.Integer" />
+	</class>
+</hibernate-mapping>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/projects/po/SubSource.hbm.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="com.rtrh.projects.modules.projects.po">
+    <class name="SubSource" table="sub_source">
+        <id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
+        <property column="sub_id" name="subId" not-null="false" type="java.lang.String" />
+        <property column="source_id" name="sourceId" not-null="false" type="java.lang.String" />
+        <property name="state" type="java.lang.String">
+            <column name="state" default="1"/>
+        </property>
+        <property column="amt" name="amt" not-null="false" type="java.math.BigDecimal" />
+        <property column="amt_sj" name="amtSj" not-null="false" type="java.math.BigDecimal" />
+        <property column="amt_xd" name="amtXd" not-null="false" type="java.math.BigDecimal" />
+        <property column="amt_sb" name="amtSb" not-null="false" type="java.math.BigDecimal" />
+        <property column="amt_pay" name="amtPay" not-null="false" type="java.math.BigDecimal" />
+        <property column="pay_rate" name="payRate" not-null="false" type="java.lang.Integer" />
+        <property column="plan_date" name="planDate" not-null="false" type="java.util.Date" />
+        <property column="logic_delete_flag" name="logicDeleteFlag" not-null="false" type="java.lang.Integer" />
+    </class>
+</hibernate-mapping>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/projects/po/SubSourceDetail.hbm.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="com.rtrh.projects.modules.projects.po">
+    <class name="SubSourceDetail" table="sub_source_detail">
+        <id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
+        <property column="sub_id" name="subId" not-null="false" type="java.lang.String" />
+        <property column="source_id" name="sourceId" not-null="false" type="java.lang.String" />
+        <property column="amt" name="amt" not-null="false" type="java.math.BigDecimal" />
+        <property column="cat" name="cat" not-null="true" type="java.lang.String" />
+        <property column="year" name="year" not-null="true" type="java.lang.String" />
+        <property column="amt_sj" name="amtSj" not-null="false" type="java.math.BigDecimal" />
+        <property column="amt_pay" name="amtPay" not-null="false" type="java.math.BigDecimal" />
+        <property column="pay_rate" name="payRate" not-null="false" type="java.lang.Integer" />
+        <property column="plan_date" name="planDate" not-null="false" type="java.util.Date" />
+        <property column="logic_delete_flag" name="logicDeleteFlag" not-null="false" type="java.lang.Integer" />
+    </class>
+</hibernate-mapping>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/projects/po/SubStart.hbm.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="com.rtrh.projects.modules.projects.po">
+	<class name="SubStart" table="sub_start">
+		<id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
+        <property column="name_sqr" name="nameSqr" not-null="false" type="java.lang.String" />
+        <property column="sub_id" name="subId" not-null="false" type="java.lang.String" />
+        <property column="reason" name="reason" not-null="false" type="java.lang.String" />
+        <property column="date_sq" name="dateSq" not-null="false" type="java.util.Date" />
+        <property column="status" name="status" not-null="false" type="java.lang.String" />
+        <property column="status_sp" name="statusSp" not-null="false" type="java.lang.String" />
+        <property column="name_sp" name="nameSp" not-null="false" type="java.lang.String" />
+        <property column="date_sp" name="dateSp" not-null="false" type="java.util.Date" />
+        <property column="logic_delete_flag" name="logicDeleteFlag" not-null="false" type="java.lang.Integer" />
+	</class>
+</hibernate-mapping>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/projects/po/SubVerify.hbm.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="com.rtrh.projects.modules.projects.po">
+    <class name="SubVerify" table="sub_verify">
+        <id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
+        <property column="sub_id" name="subId" not-null="false" type="java.lang.String" />
+        <property column="`index`" name="index" not-null="false" type="java.lang.Integer" />
+        <property column="unit_id" name="unitId" not-null="false" type="java.lang.String" />
+        <property column="depart_id" name="departId" not-null="false" type="java.lang.String" />
+        <property column="status_sp" name="statusSp" not-null="false" type="java.lang.String" />
+        <property column="status" name="status" not-null="false" type="java.lang.String" />
+        <property column="name_sp" name="nameSp" not-null="false" type="java.lang.String" />
+        <property column="date_sp" name="dateSp" not-null="false" type="java.util.Date" />
+        <property column="logic_delete_flag" name="logicDeleteFlag" not-null="false" type="java.lang.Integer" />
+    </class>
+</hibernate-mapping>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/projects/po/SubchangeInfo.hbm.xml

@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="com.rtrh.projects.modules.projects.po">
+	<class name="SubchangeInfo" table="subchange_info">
+		<id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
+        <property column="remark" name="remark" not-null="false" type="java.lang.String" />
+        <property column="unit_id" name="unitId" not-null="false" type="java.lang.String" />
+        <property column="main_id" name="mainId" not-null="false" type="java.lang.String" />
+        <property column="approve_id" name="approveId" not-null="false" type="java.lang.String" />
+        <property column="approve_departid2" name="approveDepartid2" not-null="false" type="java.lang.String" />
+        <property column="approve_departid" name="approveDepartid" not-null="false" type="java.lang.String" />
+        <property column="is_approve_fgw" name="isApproveFgw" not-null="false" type="java.lang.String" />
+        <property column="sub_id" name="subId" not-null="false" type="java.lang.String" />
+        <property column="kind_proc" name="kindProc" not-null="false" type="java.lang.String" />
+        <property column="sub_code" name="subCode" not-null="false" type="java.lang.String" />
+        <property column="sub_name" name="subName" not-null="false" type="java.lang.String" />
+        <property column="kind" name="kind" not-null="false" type="java.lang.String" />
+        <property column="indus_kind" name="indusKind" not-null="false" type="java.lang.String" />
+        <property column="prop_kind" name="propKind" not-null="false" type="java.lang.String" />
+        <property column="amt_total" name="amtTotal" not-null="false" type="java.math.BigDecimal" />
+            <property column="amt_ly1" name="amtLy1" not-null="false" type="java.math.BigDecimal" />
+            <property column="amt_ly2" name="amtLy2" not-null="false" type="java.math.BigDecimal" />
+            <property column="amt_ly3" name="amtLy3" not-null="false" type="java.math.BigDecimal" />
+            <property column="amt_ly4" name="amtLy4" not-null="false" type="java.math.BigDecimal" />
+            <property column="amt_ly5" name="amtLy5" not-null="false" type="java.math.BigDecimal" />
+            <property column="amt_ly6" name="amtLy6" not-null="false" type="java.math.BigDecimal" />
+            <property column="amt_ly7" name="amtLy7" not-null="false" type="java.math.BigDecimal" />
+            <property column="amt_comptotal" name="amtComptotal" not-null="false" type="java.math.BigDecimal" />
+            <property column="subject_id" name="subjectId" not-null="false" type="java.lang.String" />
+            <property column="kind_nature" name="kindNature" not-null="false" type="java.lang.String" />
+            <property column="is_rk" name="isRk" not-null="false" type="java.lang.String" />
+
+
+        <property column="amt_year" name="amtYear" not-null="false" type="java.math.BigDecimal" />
+        <property column="begin_date" name="beginDate" not-null="false" type="java.util.Date" />
+        <property column="end_date" name="endDate" not-null="false" type="java.util.Date" />
+        <property column="content" name="content" not-null="false" type="java.lang.String" />
+        <property column="addre" name="addre" not-null="false" type="java.lang.String" />
+        <property column="name_zrr" name="nameZrr" not-null="false" type="java.lang.String" />
+        <property column="name_lead" name="nameLead" not-null="false" type="java.lang.String" />
+        <property column="tel_lead" name="telLead" not-null="false" type="java.lang.String" />
+        <property column="tel" name="tel" not-null="false" type="java.lang.String" />
+        <property column="conf_time" name="confTime" not-null="false" type="java.util.Date" />
+        <property column="reason" name="reason" not-null="false" type="java.lang.String" />
+        <property column="reason_bg" name="reasonBg" not-null="false" type="java.lang.String" />
+        <property column="status" name="status" not-null="false" type="java.lang.String" />
+        <property column="status_sp" name="statusSp" not-null="false" type="java.lang.String" />
+        <property column="name_sp" name="nameSp" not-null="false" type="java.lang.String" />
+        <property column="date_sp" name="dateSp" not-null="false" type="java.util.Date" />
+        <property column="name_sp_fgw" name="nameSpFgw" not-null="false" type="java.lang.String" />
+        <property column="date_sp_fgw" name="dateSpFgw" not-null="false" type="java.util.Date" />
+        <property column="create_time" name="createTime" not-null="false" type="java.util.Date" />
+        <property column="create_user_id" name="createUserId" not-null="false" type="java.lang.String" />
+        <property column="last_update_userId" name="lastUpdateUserId" not-null="false" type="java.lang.String" />
+        <property column="last_update_time" name="lastUpdateTime" not-null="false" type="java.util.Date" />
+        <property column="logic_delete_flag" name="logicDeleteFlag" not-null="false" type="java.lang.Integer" />
+	</class>
+</hibernate-mapping>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/projects/po/SubchangePlan.hbm.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="com.rtrh.projects.modules.projects.po">
+	<class name="SubchangePlan" table="subchange_plan">
+		<id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
+
+<!--        <property column="main_id" name="mainId" not-null="false" type="java.lang.String" />-->
+<!--        <property column="approve_id" name="approveId" not-null="false" type="java.lang.String" />-->
+<!--        <property column="approve_departid" name="approveDepartid" not-null="false" type="java.lang.String" />-->
+<!--        <property column="is_approve_fgw" name="isApproveFgw" not-null="false" type="java.lang.String" />-->
+<!--        <property column="approve_departid2" name="approveDepartid2" not-null="false" type="java.lang.String" />-->
+
+
+        <property column="remark" name="remark" not-null="false" type="java.lang.String" />
+        <property column="sub_id" name="subId" not-null="false" type="java.lang.String" />
+        <property column="subplan_id" name="subplanId" not-null="false" type="java.lang.String" />
+        <property column="subchange_id" name="subchangeId" not-null="false" type="java.lang.String" />
+        <property column="amt_jh" name="amtJh" not-null="false" type="java.math.BigDecimal" />
+        <property column="num_rate" name="numRate" not-null="false" type="java.math.BigDecimal" />
+        <property column="end_date" name="endDate" not-null="false" type="java.util.Date" />
+        <property column="content" name="content" not-null="false" type="java.lang.String" />
+        <property column="status_sp" name="statusSp" not-null="false" type="java.lang.String" />
+        <property column="name_sp" name="nameSp" not-null="false" type="java.lang.String" />
+        <property column="date_sp" name="dateSp" not-null="false" type="java.util.Date" />
+        <property column="logic_delete_flag" name="logicDeleteFlag" not-null="false" type="java.lang.Integer" />
+	</class>
+</hibernate-mapping>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/projects/po/SyncLog.hbm.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="com.rtrh.projects.modules.projects.po">
+    <class name="SyncLog" table="sync_log">
+        <id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
+        <property column="cat" name="cat" not-null="false" type="java.lang.String" />
+        <property name="content" type="java.lang.String">
+            <column name="content" not-null="false" sql-type="text"/>
+        </property>
+        <property name="info" type="java.lang.String">
+            <column name="info" not-null="false" sql-type="text"/>
+        </property>
+        <property column="remark" name="remark" not-null="false" type="java.lang.String" />
+        <property column="create_time" name="createTime" not-null="false" type="java.util.Date" />
+        <property column="state" name="state" not-null="false" type="java.lang.String" />
+        <property column="is_handle" name="isHandle" not-null="false" type="java.lang.String" />
+    </class>
+</hibernate-mapping>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/projects/po/SyncVist.hbm.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="com.rtrh.projects.modules.projects.po">
+    <class name="SyncVisit" table="sync_visit">
+        <id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
+        <property column="cat" name="cat" not-null="false" type="java.lang.String" />
+        <property column="other_title" name="otherTitle" not-null="false" type="java.lang.String" />
+        <property column="create_time" name="createTime" not-null="false" type="java.util.Date" />
+        <property column="sys_id" name="sysId" not-null="false" type="java.lang.String" />
+    </class>
+</hibernate-mapping>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/records/po/MeetingFile.hbm.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="com.rtrh.projects.modules.records.po">
+	<class name="MeetingFile" table="meeting_file">
+		<id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
+        <property column="record_id" name="recordId" not-null="false" type="java.lang.String" />
+        <property column="file_id" name="fileId" not-null="false" type="java.lang.String" />
+        <property column="file_type" name="fileType" not-null="false" type="java.lang.String" />
+        <property column="file_name" name="fileName" not-null="false" type="java.lang.String" />
+        <property column="create_time" name="createTime" not-null="false" type="java.util.Date" />
+        <property column="logic_delete_flag" name="logicDeleteFlag" not-null="false" type="java.lang.Integer" />
+	</class>
+</hibernate-mapping>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/records/po/MeetingPlan.hbm.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="com.rtrh.projects.modules.records.po">
+	<class name="MeetingPlan" table="meeting_plan">
+		<id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
+        <property column="record_id" name="recordId" not-null="false" type="java.lang.String" />
+        <property column="main_person" name="mainPerson" not-null="false" type="java.lang.String" />
+        <property column="end_date" name="endDate" not-null="false" type="java.util.Date" />
+        <property column="plan_content" name="planContent" not-null="false" type="java.lang.String" />
+        <property column="remark" name="remark" not-null="false" type="java.lang.String" />
+        <property column="create_time" name="createTime" not-null="false" type="java.util.Date" />
+        <property column="logic_delete_flag" name="logicDeleteFlag" not-null="false" type="java.lang.Integer" />
+	</class>
+</hibernate-mapping>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/records/po/MeetingRecordsPO.hbm.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="com.rtrh.projects.modules.records.po">
+	<class name="MeetingRecordsPO" table="meeting_records">
+		<id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
+        <property column="host" name="host" not-null="false" type="java.lang.String" />
+        <property column="meeting_place" name="meetingPlace" not-null="false" type="java.lang.String" />
+        <property column="kind" name="kind" not-null="false" type="java.lang.String" />
+        <property column="meeting_date" name="meetingDate" not-null="false" type="java.util.Date" />
+        <property column="meeting_title" name="meetingTitle" not-null="false" type="java.lang.String" />
+        <property name="content" type="java.lang.String">
+        	<column name="content" not-null="false" sql-type="text"/>
+        </property>
+        <property column="remark" name="remark" not-null="false" type="java.lang.String" />
+        <property name="joinPerson" type="java.lang.String">
+        	<column name="join_person" not-null="false" sql-type="varchar(1000)"/>
+        </property>
+        <property name="solveProblem" type="java.lang.String">
+        	<column name="solve_problem" not-null="false" sql-type="text"/>
+        </property>
+        <property column="create_time" name="createTime" not-null="false" type="java.util.Date" />
+        <property column="create_user" name="createUser" not-null="false" type="java.lang.String" />
+        <property column="update_time" name="updateTime" not-null="false" type="java.util.Date" />
+        <property column="update_user" name="updateUser" not-null="false" type="java.lang.String" />
+        <property column="logic_delete_flag" name="logicDeleteFlag" not-null="false" type="java.lang.Integer" />
+	</class>
+</hibernate-mapping>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/records/po/SubMeeting.hbm.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="com.rtrh.projects.modules.records.po">
+	<class name="SubMeeting" table="sub_meeting">
+		<id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
+        <property column="sub_id" name="subId" not-null="false" type="java.lang.String" />
+        <property column="meeting_id" name="meetingId" not-null="false" type="java.lang.String" />
+		<property column="description" name="description" not-null="false" type="java.lang.String" />
+		<property column="back_info" name="backInfo" not-null="false" type="java.lang.String" />
+		<property name="state" type="java.lang.Integer">
+			<column name="state" default="0"/>
+		</property>
+		<property column="user_id" name="userId" not-null="false" type="java.lang.String" />
+		<property column="user_name" name="userName" not-null="false" type="java.lang.String" />
+	</class>
+</hibernate-mapping>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/rolemeun/mapper/SecRoleMapper.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.rtrh.projects.modules.rolemeun.mapper.SecRoleMapper" >
+
+	<select id="queryMenuCodeByRoleId" resultType="String">
+		SELECT b.`code` FROM sec_rolemenu a left join menu_info b on a.menu_id = b.id
+		where a.roleinfo_id = #{roleId} AND b.type = #{menuType} AND a.logic_delete_flag = 0 and b.logic_delete_flag = 0 and a.kind = 2
+		GROUP BY a.`code`
+	</select>
+	<select id="queryAllMenuCode" resultType="String">
+		SELECT code FROM menu_info WHERE type = #{menuType} and logic_delete_flag = 0 and kind = 2
+
+	</select>
+</mapper>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/rolemeun/mapper/SecUserAuthMapper.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.rtrh.projects.modules.rolemeun.mapper.SecUserAuthMapper">
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, user_id, subject_id, create_time, cat, create_user_id, last_update_user_id, last_update_time, logic_delete_flag, remark
+    </sql>
+    <select id="findSubjectAuthIdsByUserId" resultType="java.lang.String">
+        SELECT
+            a.subject_id
+        FROM
+            sec_user u,
+            sec_user_auth a
+        WHERE
+            a.logic_delete_flag = 0
+          AND u.status_subject = '0'
+          AND u.id = a.user_id
+          AND u.id = #{userId}
+    </select>
+
+
+</mapper>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/rolemeun/po/MeunInfo.hbm.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="gb2312"?>
+        <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="com.rtrh.projects.modules.rolemeun.po">
+<class name="MeunInfo" table="menu_info">
+        <id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
+        <property column="code" name="code" not-null="false" type="java.lang.String" />
+        <property column="title" name="title" not-null="false" type="java.lang.String" />
+        <property column="ismenu" name="ismeun" not-null="false" type="java.lang.String" />
+        <property column="type" name="type" not-null="false" type="java.lang.Integer" />
+        <property column="lastcode" name="lastcode" not-null="false" type="java.lang.String" />
+        <property column="remark" name="remark" not-null="false" type="java.lang.String" />
+		<property column="logic_delete_flag" name="logicDeleteFlag" not-null="false" type="java.lang.Integer" />
+		<property column="sort_index" name="sortIndex" not-null="false" type="java.lang.Integer" />
+</class>
+</hibernate-mapping>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/rolemeun/po/SecRole.hbm.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="com.rtrh.projects.modules.rolemeun.po">
+	<class name="SecRole" table="sec_role">
+		<id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
+            <property column="code" name="code" not-null="false" type="java.lang.String" />
+           <property column="title" name="title" not-null="false" type="java.lang.String" />
+        <property column="remark" name="remark" not-null="false" type="java.lang.String" />
+        <property column="create_time" name="createTime" not-null="false" type="java.util.Date" />
+        <property column="create_user_id" name="createUserId" not-null="false" type="java.lang.String" />
+        <property column="last_update_user_id" name="lastUpdateUserId" not-null="false" type="java.lang.String" />
+        <property column="last_update_time" name="lastUpdateTime" not-null="false" type="java.util.Date" />
+        <property column="logic_delete_flag" name="logicDeleteFlag" not-null="false" type="java.lang.Integer" />
+	</class>
+</hibernate-mapping>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/rolemeun/po/SecRoleMeun.hbm.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="com.rtrh.projects.modules.rolemeun.po">
+    <class name="SecRoleMeun" table="sec_rolemenu">
+        <id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
+        <property column="roleinfo_id" name="roleinfoId" not-null="false" type="java.lang.String" />
+        <property column="code" name="code" not-null="false" type="java.lang.String" />
+        <property column="title" name="title" not-null="false" type="java.lang.String" />
+        <property column="menu_id" name="menuId" not-null="false" type="java.lang.String" />
+        <property column="logic_delete_flag" name="logicDeleteFlag" not-null="false" type="java.lang.Integer" />
+    </class>
+</hibernate-mapping>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/rolemeun/po/SecUserAuth.hbm.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="com.rtrh.projects.modules.rolemeun.po">
+    <class name="SecUserAuth" table="sec_user_auth">
+        <id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
+        <property column="user_id" name="userId" not-null="false" type="java.lang.String" />
+        <property column="subject_id" name="subjectId" not-null="false" type="java.lang.String" />
+        <property column="create_time" name="createTime" not-null="false" type="java.util.Date"/>
+        <property column="cat" name="cat" not-null="false" type="java.lang.String" />
+        <property column="remark" name="remark" not-null="false" type="java.lang.String" />
+        <property column="create_user_id" name="createUserId" not-null="false" type="java.lang.String"/>
+        <property column="last_update_user_id" name="lastUpdateUserId" not-null="false" type="java.lang.String"/>
+        <property column="last_update_time" name="lastUpdateTime" not-null="false" type="java.util.Date"/>
+        <property column="logic_delete_flag" name="logicDeleteFlag" not-null="false" type="java.lang.Integer"/>
+    </class>
+</hibernate-mapping>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/system/mapper/PersonInfoMapper.xml

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.rtrh.projects.modules.system.mapper.PersonInfoMapper" >
+
+	<select id="queryUserInfo" resultType="com.rtrh.projects.modules.system.vo.PersonInfoVO">
+		SELECT
+			c.id,
+			c.enabled,
+			c.locked,
+			p.login,
+		    j.title as departId,
+			p.title,
+			r.title as kind,
+			u.title as unitName,
+		    p.email,
+		    p.is_lead as isLead,
+			p.sim_code as simCode,
+		    p.last_update_user_name as lastUpdateUserName,
+            p.update_time  as updateTime,
+		    p.status_unit as statusUnit,
+		    u.name_jur1  as nameJur1,
+		    p.status_proj as statusProj
+		FROM
+			comm_user AS c
+			LEFT JOIN sec_user p on c.id = p.id
+			LEFT JOIN j_unit u ON p.unit_id = u.id and  u.kind=2
+			LEFT JOIN j_depart j on p.depart_id =j.id
+		LEFT JOIN sec_role r on p.kind=r.id and r.logic_delete_flag=0
+		WHERE
+			1 = 1 AND  (p.kind_unit=1 or p.kind_unit is null ) and p.logic_delete_flag=0
+		<if test="loginName != null and loginName != ''">
+			AND p.login LIKE #{loginName}
+		</if>
+		<if test="realName != null and realName != ''">
+			AND p.title LIKE #{realName}
+		</if>
+		<if test="kind != null and kind != ''">
+			AND p.kind = #{kind}
+		</if>
+		<if test="unitName != null and unitName !=''">
+			AND u.title LIKE #{unitName}
+		</if>
+		<if test="userId != null and userId != ''">
+			AND c.id = #{userId}
+		</if>
+	</select>
+
+</mapper>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/system/mapper/WeekAndMonrhFileMapper.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.rtrh.projects.modules.system.mapper.WeekAndMonrhFileMapper" >
+
+
+<insert id="saveOrUpdateAll" parameterType="java.util.List">
+    insert into kb_teach_together_group_member
+    (
+    id,
+    create_time,
+    create_user_id,
+    last_update_time,
+    last_update_userId,
+    main_id
+    )
+    values
+    <foreach collection="list" item="item" index= "index" separator =",">
+        (
+        #{item.id},
+        #{item.createTime},
+        #{item.createUserId},
+        #{item.lastUpdateTime},
+        #{item.lastUpdateUserId},
+        #{item.mainId}
+        )
+    </foreach>
+</insert>
+</mapper>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/system/po/ApprovalUnitSetting.hbm.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="com.rtrh.projects.modules.system.po">
+    <class name="ApprovalUnitSetting" table="approval_unit_setting">
+        <id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
+        <property column="approval_unit_id" name="approvalUnitId" not-null="false" type="java.lang.String" />
+        <property column="document_id" name="documentId" not-null="false" type="java.lang.String" />
+        <property column="location" name="location" not-null="false" type="java.lang.String" />
+        <property column="kind" name="kind" not-null="false" type="java.lang.String" />
+        <property column="create_time" name="createTime" not-null="false" type="java.util.Date" />
+        <property column="create_user_id" name="createUserId" not-null="false" type="java.lang.String" />
+        <property column="last_update_userId" name="lastUpdateUserId" not-null="false" type="java.lang.String" />
+        <property column="last_update_time" name="lastUpdateTime" not-null="false" type="java.util.Date" />
+        <property column="logic_delete_flag" name="logicDeleteFlag" not-null="false" type="java.lang.Integer" />
+    </class>
+</hibernate-mapping>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/system/po/Division.hbm.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="com.rtrh.projects.modules.system.po">
+	<class name="Division" table="division">
+		<id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
+		<property column="parent_id" name="parentId" not-null="false" type="java.lang.String" />
+		<property column="name" name="name" not-null="false" type="java.lang.String" />
+        <property column="code" name="code" not-null="false" type="java.lang.String" />
+        <property column="type" name="type" not-null="false" type="java.lang.String" />
+	</class>
+</hibernate-mapping>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/system/po/JDepart.hbm.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="com.rtrh.projects.modules.system.po">
+	<class name="JDepart" table="j_depart">
+		<id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
+		<property column="unit_id" name="unitId" not-null="false" type="java.lang.String" />
+		<property column="code" name="code" not-null="false" type="java.lang.String" />
+		<property column="title" name="title" not-null="false" type="java.lang.String" />
+		<property column="name_lead" name="nameLead" not-null="false" type="java.lang.String" />
+        <property column="tel" name="tel" not-null="false" type="java.lang.String" />
+        <property column="remark" name="remark" not-null="false" type="java.lang.String" />
+        <property column="create_time" name="createTime" not-null="false" type="java.util.Date" />
+        <property column="create_user_id" name="createUserId" not-null="false" type="java.lang.String" />
+        <property column="last_update_userId" name="lastUpdateUserId" not-null="false" type="java.lang.String" />
+        <property column="last_update_time" name="lastUpdateTime" not-null="false" type="java.util.Date" />
+        <property column="logic_delete_flag" name="logicDeleteFlag" not-null="false" type="java.lang.Integer" />
+	</class>
+</hibernate-mapping>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/system/po/JUnit.hbm.xml

@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="com.rtrh.projects.modules.system.po">
+	<class name="JUnit" table="j_unit">
+		<id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
+		<property column="title" name="title" not-null="false" type="java.lang.String" />
+		<property column="code" name="code" not-null="false" type="java.lang.String" />
+		<property column="kind" name="kind" not-null="false" type="java.lang.String" />
+		<property column="name_zrr" name="nameZrr" not-null="false" type="java.lang.String" />
+		<property column="name_lead" name="nameLead" not-null="false" type="java.lang.String" />
+		<property column="name_pt" name="namePt" not-null="false" type="java.lang.String" />
+        <property column="tel" name="tel" not-null="false" type="java.lang.String" />
+        <property column="tel_pt" name="telPt" not-null="false" type="java.lang.String" />
+        <property column="addre" name="addre" not-null="false" type="java.lang.String" />
+        <property column="remark" name="remark" not-null="false" type="java.lang.String" />
+        <property column="create_time" name="createTime" not-null="false" type="java.util.Date" />
+        <property column="create_user_id" name="createUserId" not-null="false" type="java.lang.String" />
+        <property column="last_update_userId" name="lastUpdateUserId" not-null="false" type="java.lang.String" />
+        <property column="last_update_time" name="lastUpdateTime" not-null="false" type="java.util.Date" />
+        <property column="date_found" name="dateFound" not-null="false" type="java.util.Date" />
+        <property column="logic_delete_flag" name="logicDeleteFlag" not-null="false" type="java.lang.Integer" />
+
+
+
+
+        <property column="subject_id" name="subjectId" not-null="false" type="java.lang.String" />
+        <property column="title_abb" name="titleAbb" not-null="false" type="java.lang.String" />
+        <property column="province" name="province" not-null="false" type="java.lang.String" />
+        <property column="city" name="city" not-null="false" type="java.lang.String" />
+        <property column="area" name="area" not-null="false" type="java.lang.String" />
+        <property column="postcode" name="postcode" not-null="false" type="java.lang.String" />
+        <property column="group_code1" name="groupCode1" not-null="false" type="java.lang.String" />
+        <property column="group_code2" name="groupCode2" not-null="false" type="java.lang.String" />
+        <property column="trust_code" name="trustCode" not-null="false" type="java.lang.String" />
+        <property column="amt" name="amt" not-null="false" type="java.math.BigDecimal" />
+
+        <property column="sim_code" name="simCode" not-null="false" type="java.lang.String" />
+        <property column="fax" name="fax" not-null="false" type="java.lang.String" />
+        <property column="e_mail" name="email" not-null="false" type="java.lang.String" />
+        <property column="unit_prop_id" name="unitPropId" not-null="false" type="java.lang.String" />
+        <property column="is_jur" name="isJur" not-null="false" type="java.lang.String" />
+        <property column="unit_kind_id" name="unitKindId" not-null="false" type="java.lang.String" />
+        <property column="name_jur1" name="nameJur1" not-null="false" type="java.lang.String" />
+        <property column="sex_1" name="sex1" not-null="false" type="java.lang.String" />
+
+
+
+        <property column="kind_unit" name="kindUnit" not-null="false" type="java.lang.String" />
+        <property column="kind_code" name="kindCode" not-null="false" type="java.lang.String" />
+        <property column="reason" name="reason" not-null="false" type="java.lang.String" />
+        <property column="tel_1" name="tel1" not-null="false" type="java.lang.String" />
+        <property column="sim_code1" name="simCode1" not-null="false" type="java.lang.String" />
+        <property column="fax_code1" name="faxCode1" not-null="false" type="java.lang.String" />
+        <property column="e_mail1" name="email1" not-null="false" type="java.lang.String" />
+        <property column="kind_1" name="kind1" not-null="false" type="java.lang.String" />
+        <property column="state_1" name="state1" not-null="false" type="java.lang.String" />
+        <property column="country_1" name="country1" not-null="false" type="java.lang.String" />
+        <property column="passport_1" name="passport1" not-null="false" type="java.lang.String" />
+
+
+
+
+            <property column="name_jur2" name="nameJur2" not-null="false" type="java.lang.String" />
+            <property column="sex_2" name="sex2" not-null="false" type="java.lang.String" />
+            <property column="tel_2" name="tel2" not-null="false" type="java.lang.String" />
+            <property column="sim_code2" name="simCode2" not-null="false" type="java.lang.String" />
+            <property column="fax_code2" name="faxCode2" not-null="false" type="java.lang.String" />
+            <property column="e_mail2" name="email2" not-null="false" type="java.lang.String" />
+            <property column="kind_2" name="kind2" not-null="false" type="java.lang.String" />
+            <property column="state_2" name="state2" not-null="false" type="java.lang.String" />
+
+
+
+            <property column="country_2" name="country2" not-null="false" type="java.lang.String" />
+            <property column="passport_2" name="passport2" not-null="false" type="java.lang.String" />
+            <property column="file_name" name="fileName" not-null="false" type="java.lang.String" />
+            <property column="file_addre" name="fileAddre" not-null="false" type="java.lang.String" />
+            <property column="file_prop" name="fileProp" not-null="false" type="java.lang.String" />
+            <property column="status" name="status" not-null="false" type="java.lang.String" />
+            <property column="name_sp" name="nameSp" not-null="false" type="java.lang.String" />
+            <property column="date_sp" name="dateSp" not-null="false" type="java.util.Date" />
+
+	</class>
+</hibernate-mapping>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/system/po/Picture.hbm.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="com.rtrh.projects.modules.system.po">
+    <class name="Picture" table="picture">
+        <id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
+        <property column="name" name="name" not-null="false" type="java.lang.String" />
+        <property column="type" name="type" not-null="false" type="java.lang.String" />
+        <property column="picture_id" name="pictureId" not-null="false" type="java.lang.String" />
+        <!--		<property column="subject_id" name="subjectId" not-null="false" type="java.lang.String" />-->
+        <property column="is_use" name="isUse" not-null="false" type="java.lang.Integer" />
+        <property column="create_time" name="createTime" not-null="false" type="java.util.Date" />
+        <property column="create_user_id" name="createUserId" not-null="false" type="java.lang.String" />
+        <property column="last_update_user_id" name="lastUpdateUserId" not-null="false" type="java.lang.String" />
+        <property column="last_update_time" name="lastUpdateTime" not-null="false" type="java.util.Date" />
+        <property column="logic_delete_flag" name="logicDeleteFlag" not-null="false" type="java.lang.Integer" />
+    </class>
+</hibernate-mapping>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/system/po/SecUser.hbm.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="com.rtrh.projects.modules.system.po">
+	<class name="SecUser" table="sec_user">
+		<id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
+		<property column="login" name="login" not-null="false" type="java.lang.String" />
+		<property column="title" name="title" not-null="false" type="java.lang.String" />
+		<property column="kind_unit" name="kindUnit" not-null="false" type="java.lang.String" />
+		<property column="is_unit" name="isUnit" not-null="false" type="java.lang.Boolean" />
+		<property column="kind" name="kind" not-null="false" type="java.lang.String" />
+		<property column="unit_id" name="unitId" not-null="false" type="java.lang.String" />
+		<property column="unit_dw_id" name="unitDWId" not-null="false" type="java.lang.String" />
+		<property column="depart_id" name="departId" not-null="false" type="java.lang.String" />
+		<property column="remark" name="remark" not-null="false" type="java.lang.String" />
+		<property column="email" name="email" not-null="false" type="java.lang.String" />
+		<property column="sim_code" name="simCode" not-null="false" type="java.lang.String" />
+		<property column="job" name="job" not-null="false" type="java.lang.String" />
+		<property column="status_unit" name="statusUnit" not-null="false" type="java.lang.String" />
+		<property column="status_proj" name="statusProj" not-null="false" type="java.lang.String" />
+		<property column="edit" name="edit" not-null="false" type="java.lang.Boolean" />
+		<property column="is_lead" name="isLead" not-null="false" type="java.lang.Boolean" />
+		<property column="create_user_id" name="createUserId" not-null="false" type="java.lang.String" />
+        <property column="create_user_name" name="createUserName" not-null="false" type="java.lang.String" />
+        <property column="create_time" name="createTime" not-null="false" type="java.util.Date" />
+        <property column="last_update_user_id" name="lastUpdateUserId" not-null="false" type="java.lang.String" />
+        <property column="last_update_user_name" name="lastUpdateUserName" not-null="false" type="java.lang.String" />
+        <property column="update_time" name="updateTime" not-null="false" type="java.util.Date" />
+        <property column="logic_delete_flag" name="logicDeleteFlag" not-null="false" type="java.lang.Boolean" />
+		<property column="status_subject" name="statusSubject" not-null="false" type="java.lang.String"/>
+	</class>
+</hibernate-mapping>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/system/po/SubDataLog.hbm.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="com.rtrh.projects.modules.system.po">
+    <class name="SubDataLog" table="sub_data_log">
+        <id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
+        <property column="kind" name="kind" not-null="false" type="java.lang.String" />
+        <property column="type" name="type" not-null="false" type="java.lang.String" />
+        <property column="sub_id" name="subId" not-null="false" type="java.lang.String" />
+        <property column="field_mark" name="fieldMark" not-null="false" type="java.lang.String" />
+        <property column="field_desc" name="fieldDesc" not-null="false" type="java.lang.String" />
+        <property column="field_supp" name="fieldSupp" not-null="false" type="java.lang.String" />
+        <property column="content_old" name="contentOld" not-null="false" type="java.lang.String" />
+        <property column="content" name="content" not-null="false" type="java.lang.String" />
+        <property column="num" name="num" not-null="false" type="java.math.BigDecimal" />
+        <property column="last_update_user_id" name="lastUpdateUserId" not-null="false" type="java.lang.String" />
+        <property column="last_update_time" name="lastUpdateTime" not-null="false" type="java.util.Date" />
+    </class>
+</hibernate-mapping>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/system/po/SysLogpo.hbm.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="com.rtrh.projects.modules.system.po">
+    <class name="SysLogPo" table="sys_log">
+        <id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
+
+        <property column="unitId" name="unitId" not-null="false" type="java.lang.String" />
+        <property column="url" name="url" not-null="false" type="java.lang.String" />
+        <property column="module_name" name="moduleName" not-null="false" type="java.lang.String" />
+        <property column="method_name" name="methodName" not-null="false" type="java.lang.String" />
+        <property column="ip" name="ip" not-null="false" type="java.lang.String" />
+        <property column="op_time" name="opTime" not-null="false" type="java.lang.Long" />
+        <property column="data_json" name="dataJson" not-null="false" type="java.lang.String" />
+        <property column="params" name="params" not-null="false" type="java.lang.String" />
+        <property column="request_type" name="requestType" not-null="false" type="java.lang.String" />
+        <property column="res_data" name="resData" not-null="false" type="java.lang.String" />
+        <property column="client_msg" name="clientMsg" not-null="false" type="java.lang.String" />
+        <property column="status" name="status" not-null="false" type="java.lang.Boolean" />
+        <property column="create_user_id" name="createUserId" not-null="false" type="java.lang.String" />
+        <property column="create_user_name" name="createUserName" not-null="false" type="java.lang.String" />
+        <property column="create_time" name="createTime" not-null="false" type="java.util.Date" />
+    </class>
+</hibernate-mapping>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/system/po/TSystable.hbm.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="com.rtrh.projects.modules.system.po">
+	<class name="TSystable" table="t_systable">
+		<id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
+		<property column="title" name="title" not-null="false" type="java.lang.String" />
+		<property column="code" name="code" not-null="false" type="java.lang.String" />
+		<property column="kind" name="kind" not-null="false" type="java.lang.String" />
+		<property column="unit_id" name="unitId" not-null="false" type="java.lang.String" />
+<!--		<property column="subject_id" name="subjectId" not-null="false" type="java.lang.String" />-->
+        <property column="remark" name="remark" not-null="false" type="java.lang.String" />
+        <property column="create_time" name="createTime" not-null="false" type="java.util.Date" />
+        <property column="create_user_id" name="createUserId" not-null="false" type="java.lang.String" />
+        <property column="last_update_user_id" name="lastUpdateUserId" not-null="false" type="java.lang.String" />
+        <property column="last_update_time" name="lastUpdateTime" not-null="false" type="java.util.Date" />
+        <property column="logic_delete_flag" name="logicDeleteFlag" not-null="false" type="java.lang.Integer" />
+<!--		<property column="is_show" name="isShow"     not-null="true" type="java.lang.Integer" />-->
+		<property name="isShow" type="java.lang.Integer">
+			<column name="is_show" default="1"/>
+		</property>
+		<property column="catId" name="catId" not-null="false" type="java.lang.String" />
+	</class>
+</hibernate-mapping>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/system/po/WeekAndMonthFile.hbm.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="com.rtrh.projects.modules.system.po">
+    <class name="WeekAndMonthFile" table="week_and_month_file">
+        <id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
+        <property column="file_name" name="fileName" not-null="false" type="java.lang.String" />
+        <property column="file_addre" name="fileAddre" not-null="false" type="java.lang.String" />
+        <property column="file_type" name="fileType" not-null="false" type="java.lang.String" />
+        <property column="main_id" name="mainId" not-null="false" type="java.lang.String" />
+
+
+        <property column="create_time" name="createTime" not-null="false" type="java.util.Date" />
+        <property column="create_user_id" name="createUserId" not-null="false" type="java.lang.String" />
+        <property column="last_update_userId" name="lastUpdateUserId" not-null="false" type="java.lang.String" />
+        <property column="last_update_time" name="lastUpdateTime" not-null="false" type="java.util.Date" />
+        <property column="logic_delete_flag" name="logicDeleteFlag" not-null="false" type="java.lang.Integer" />
+    </class>
+</hibernate-mapping>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/task/po/SubTask.hbm.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="com.rtrh.projects.modules.task.po">
+	<class name="SubTask" table="sub_task">
+		<id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
+        <property column="sub_id" name="subId" not-null="false" type="java.lang.String" />
+        <property column="task_id" name="taskId" not-null="false" type="java.lang.String" />
+		<property name="backInfo" type="java.lang.String" >
+			<column name="back_info" sql-type="text" not-null="false" />
+		</property>
+		<property name="description" type="java.lang.String" >
+			<column name="description" sql-type="text" not-null="false" />
+		</property>
+		<property name="state" type="java.lang.Integer">
+			<column name="state" default="0"/>
+		</property>
+		<property column="user_id" name="userId" not-null="false" type="java.lang.String" />
+		<property column="user_name" name="userName" not-null="false" type="java.lang.String" />
+	</class>
+</hibernate-mapping>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/task/po/TaskFile.hbm.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="com.rtrh.projects.modules.task.po">
+	<class name="TaskFile" table="task_file">
+		<id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
+        <property column="record_id" name="recordId" not-null="false" type="java.lang.String" />
+        <property column="file_id" name="fileId" not-null="false" type="java.lang.String" />
+        <property column="file_type" name="fileType" not-null="false" type="java.lang.String" />
+        <property column="file_name" name="fileName" not-null="false" type="java.lang.String" />
+        <property column="create_time" name="createTime" not-null="false" type="java.util.Date" />
+        <property column="logic_delete_flag" name="logicDeleteFlag" not-null="false" type="java.lang.Integer" />
+	</class>
+</hibernate-mapping>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/task/po/TaskPlan.hbm.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="com.rtrh.projects.modules.task.po">
+	<class name="TaskPlan" table="task_plan">
+		<id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
+        <property column="record_id" name="recordId" not-null="false" type="java.lang.String" />
+        <property column="main_person" name="mainPerson" not-null="false" type="java.lang.String" />
+        <property column="end_date" name="endDate" not-null="false" type="java.util.Date" />
+        <property column="plan_content" name="planContent" not-null="false" type="java.lang.String" />
+        <property column="remark" name="remark" not-null="false" type="java.lang.String" />
+        <property column="create_time" name="createTime" not-null="false" type="java.util.Date" />
+        <property column="logic_delete_flag" name="logicDeleteFlag" not-null="false" type="java.lang.Integer" />
+        <property column="user_id" name="userId" not-null="false" type="java.lang.String" />
+        <property column="user_name" name="userName" not-null="false" type="java.lang.String" />
+	</class>
+</hibernate-mapping>

projects-service/${project.build.directory}/classes/com/rtrh/projects/modules/task/po/TaskRecordsPO.hbm.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping package="com.rtrh.projects.modules.task.po">
+	<class name="TaskRecordsPO" table="task_records">
+		<id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
+        <property column="place" name="place" not-null="false" type="java.lang.String" />
+        <property column="task_date" name="taskDate" not-null="false" type="java.util.Date" />
+        <property column="num" name="num" not-null="false" type="java.lang.Integer" />
+        <property column="remark" name="remark" not-null="false" type="java.lang.String" />
+        <property name="joinPerson" type="java.lang.String">
+        	<column name="join_person" not-null="false" sql-type="varchar(1000)"/>
+        </property>
+        <property name="solveProblem" type="java.lang.String">
+        	<column name="solve_problem" not-null="false" sql-type="text"/>
+        </property>
+        <property column="create_time" name="createTime" not-null="false" type="java.util.Date" />
+        <property column="create_user" name="createUser" not-null="false" type="java.lang.String" />
+        <property column="create_name" name="createName" not-null="false" type="java.lang.String" />
+        <property column="create_unit" name="createUnit" not-null="false" type="java.lang.String" />
+        <property column="update_time" name="updateTime" not-null="false" type="java.util.Date" />
+        <property column="update_user" name="updateUser" not-null="false" type="java.lang.String" />
+        <property column="logic_delete_flag" name="logicDeleteFlag" not-null="false" type="java.lang.Integer" />
+	</class>
+</hibernate-mapping>

projects-service/src/main/java/com/rtrh/projects/modules/auditLog/mapper/AuditLogMapper.java

@@ -0,0 +1,17 @@
+package com.rtrh.projects.modules.auditLog.mapper;
+
+import com.rtrh.core.repository.mybatis.MyBatisRepository;
+import com.rtrh.projects.modules.auditLog.pojo.dto.AuditQueryDTO;
+import com.rtrh.projects.modules.auditLog.pojo.vo.AuditLogQueryVO;
+
+import java.util.List;
+
+@MyBatisRepository
+public interface AuditLogMapper {
+
+    List<AuditLogQueryVO> list(AuditQueryDTO auditQueryDTO);
+
+    Long count(AuditQueryDTO auditQueryDTO);
+
+    List<AuditLogQueryVO> export(AuditQueryDTO auditQueryDTO);
+}

projects-service/src/main/java/com/rtrh/projects/modules/auditLog/mapper/AuditLogMapper.xml

@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.rtrh.projects.modules.auditLog.mapper.AuditLogMapper">
+    <select id="count" resultType="long">
+        select count(*)
+        from sys_log
+        <where>
+            <if test="moduleName != null and moduleName != ''">
+                module_name like concat('%', #{moduleName}, '%')
+            </if>
+            <if test="createUserName != null and createUserName != ''">
+                and create_user_name like concat('%', #{createUserName}, '%')
+            </if>
+            <if test="beginDate!=null">
+                and create_time >= #{beginDate}
+            </if>
+            <if test="endDate!=null">
+                and create_time &lt;= #{endDate}
+            </if>
+        </where>
+    </select>
+
+
+    <select id="list" parameterType="com.rtrh.projects.modules.auditLog.pojo.dto.AuditQueryDTO" resultType="com.rtrh.projects.modules.auditLog.pojo.vo.AuditLogQueryVO">
+        select id,module_name moduleName,create_user_name createUserName,create_time createTime,ip
+        from sys_log
+        <where>
+            <if test="moduleName!=null and moduleName!='' ">
+                module_name like concat('%',#{moduleName},'%')
+            </if>
+            <if test="createUserName!=null and createUserName!='' ">
+                and create_user_name like concat('%',#{createUserName},'%')
+            </if>
+
+            <if test="beginDate!=null">
+                and create_time >= #{beginDate}
+            </if>
+            <if test="endDate!=null">
+                and create_time &lt;= #{endDate}
+            </if>
+        </where>
+        order by create_time desc
+        limit #{startIndex},#{pageSize}
+
+    </select>
+    <select id="export" resultType="com.rtrh.projects.modules.auditLog.pojo.vo.AuditLogQueryVO">
+        select id,module_name moduleName,create_user_name createUserName,create_time createTime,ip
+        from sys_log
+        <where>
+            <if test="moduleName!=null and moduleName!='' ">
+                module_name like concat('%',#{moduleName},'%')
+            </if>
+            <if test="createUserName!=null and createUserName!='' ">
+                and create_user_name like concat('%',#{createUserName},'%')
+            </if>
+
+            <if test="beginDate!=null">
+                and create_time >= #{beginDate}
+            </if>
+            <if test="endDate!=null">
+                and create_time &lt;= #{endDate}
+            </if>
+        </where>
+        order by create_time desc
+    </select>
+</mapper>

projects-service/src/main/java/com/rtrh/projects/modules/auditLog/pojo/dto/AuditQueryDTO.java

@@ -0,0 +1,28 @@
+package com.rtrh.projects.modules.auditLog.pojo.dto;
+
+import com.rtrh.core.repository.Page;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * 小驼峰命名法：方法、变量 第一个单词字母小写，第二个单词及以后首字母大写
+ * 大驼峰命名法：类名 每个单词首字母都大写
+ * 自动格式化代码：ctrl+art+L;找到自建方法的格式ctrl+p;更改相同名称shift+F6；
+ */
+@Data
+public class AuditQueryDTO implements Serializable {
+    private String moduleName;
+    private Date beginDate;
+    private Date endDate;
+    private String createUserName;
+    private Integer pageNo;
+    private Integer pageSize;
+    private Integer startIndex;
+    public Integer getStartIndex() {
+        this.startIndex=(this.pageNo-1)*pageSize;
+        return startIndex;
+    }
+}

projects-service/src/main/java/com/rtrh/projects/modules/auditLog/pojo/vo/AuditLogQueryVO.java

@@ -0,0 +1,32 @@
+package com.rtrh.projects.modules.auditLog.pojo.vo;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import cn.hutool.core.date.DateTime;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * 小驼峰命名法：方法、变量 第一个单词字母小写，第二个单词及以后首字母大写
+ * 大驼峰命名法：类名 每个单词首字母都大写
+ * 自动格式化代码：ctrl+art+L;找到自建方法的格式ctrl+p;更改相同名称shift+F6；
+ */
+@Data
+public class AuditLogQueryVO {
+
+    @Excel(name = "序号")
+    private String id;
+
+    @Excel(name = "创建时间")
+    private String createTime;
+
+    @Excel(name = "操作人")
+    private String createUserName;
+
+    @Excel(name = "ip")
+    private String ip;
+
+    @Excel(name = "操作说明")
+    private String moduleName;
+}

projects-service/src/main/java/com/rtrh/projects/modules/auditLog/pojo/vo/QueryResultVO.java

@@ -0,0 +1,25 @@
+package com.rtrh.projects.modules.auditLog.pojo.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * 小驼峰命名法：方法、变量 第一个单词字母小写，第二个单词及以后首字母大写
+ * 大驼峰命名法：类名 每个单词首字母都大写
+ * 自动格式化代码：ctrl+art+L;找到自建方法的格式ctrl+p;更改相同名称shift+F6；
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class QueryResultVO<T> {
+
+    //当前页面数据
+    private List<T> data;
+
+    //总记录数
+    private Long count;
+
+}

projects-service/src/main/java/com/rtrh/projects/modules/auditLog/sevice/AuditLogService.java

@@ -0,0 +1,14 @@
+package com.rtrh.projects.modules.auditLog.sevice;
+
+import com.rtrh.projects.modules.auditLog.pojo.dto.AuditQueryDTO;
+import com.rtrh.projects.modules.auditLog.pojo.vo.AuditLogQueryVO;
+import com.rtrh.projects.modules.auditLog.pojo.vo.QueryResultVO;
+import com.rtrh.projects.modules.system.vo.LoginUserVO;
+
+import java.util.List;
+
+public interface AuditLogService {
+    QueryResultVO<AuditLogQueryVO> list(AuditQueryDTO auditQueryDTO);
+
+    List<AuditLogQueryVO> export(AuditQueryDTO auditQueryDTO);
+}

projects-service/src/main/java/com/rtrh/projects/modules/auditLog/sevice/impl/AuditLogServiceImpl.java

@@ -0,0 +1,48 @@
+package com.rtrh.projects.modules.auditLog.sevice.impl;
+
+import cn.hutool.poi.excel.ExcelUtil;
+import cn.hutool.poi.excel.ExcelWriter;
+import com.rtrh.projects.modules.auditLog.mapper.AuditLogMapper;
+import com.rtrh.projects.modules.auditLog.pojo.dto.AuditQueryDTO;
+import com.rtrh.projects.modules.auditLog.pojo.vo.AuditLogQueryVO;
+import com.rtrh.projects.modules.auditLog.pojo.vo.QueryResultVO;
+import com.rtrh.projects.modules.auditLog.sevice.AuditLogService;
+import com.rtrh.projects.modules.system.vo.LoginUserVO;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 小驼峰命名法：方法、变量 第一个单词字母小写，第二个单词及以后首字母大写
+ * 大驼峰命名法：类名 每个单词首字母都大写
+ * 自动格式化代码：ctrl+art+L;找到自建方法的格式ctrl+p;更改相同名称shift+F6；
+ */
+@Service
+public class AuditLogServiceImpl implements AuditLogService {
+
+    @Resource
+    private AuditLogMapper auditLogMapper;
+    @Override
+    public QueryResultVO<AuditLogQueryVO> list(AuditQueryDTO auditQueryDTO) {
+        List<AuditLogQueryVO> result=auditLogMapper.list(auditQueryDTO);
+        if (result!=null){
+            for(AuditLogQueryVO x : result){
+                String substring = x.getCreateTime().substring(0, x.getCreateTime().length() - 2);
+                x.setCreateTime(substring);
+            }
+        }
+
+        Long count =auditLogMapper.count(auditQueryDTO);
+
+        return new QueryResultVO<AuditLogQueryVO>(result,count);
+    }
+
+    @Override
+    public List<AuditLogQueryVO> export(AuditQueryDTO auditQueryDTO) {
+        List<AuditLogQueryVO> list = auditLogMapper.export(auditQueryDTO);
+        return list;
+    }
+
+
+}

projects-service/src/main/java/com/rtrh/projects/modules/projects/mapper/SubInfoMapper.java

@@ -65,8 +65,6 @@ public interface SubInfoMapper {
 
     List<SubInfoFixDetailPreNew> selectSubPreNewBySubIds(@Param("subIdList")List<String> subIdList);
 
-    List<RptCont> selectNewestMonthReport(@Param("ids") List<String> ids);
-
     List<SubInfoFixCbDetail> exportFixCbDetailExcel(@Param("stateFix") String stateFix, @Param("year") String year,@Param("subName") String subName, @Param("indusKinds") List<String> indusKinds, @Param("sbdw") String sbdw, @Param("subjectId") String subjectId, @Param("startAmt") String startAmt, @Param("endAmt") String endAmt,@Param("subjectIds") List<String> subjectIds);
 
     List<SubInfoFixZjDetail> exportFixZjDetailExcel(@Param("stateFix") String stateFix, @Param("year") String year,@Param("subName") String subName, @Param("indusKinds") List<String> indusKinds, @Param("sbdw") String sbdw, @Param("subjectId") String subjectId, @Param("startAmt") String startAmt, @Param("endAmt") String endAmt,@Param("subjectIds") List<String> subjectIds);

projects-service/src/main/java/com/rtrh/projects/modules/projects/mapper/SubInfoMapper.xml

@@ -80,49 +80,6 @@
         si.id
     </select>
 
-<!--    <resultMap id="BaseResultMap" type="com.rtrh.projects.modules.projects.po.SubInfoGxj">
-        <id column="id" property="id" />
-        <result column="sub_id" property="subId" />
-        <result column="unit_id" property="unitId" />
-        <result column="unit_desc" property="unitDesc" />
-        <result column="sub_code" property="subCode" />
-        <result column="sub_name" property="subName" />
-        <result column="indus_kind" property="indusKind" />
-        <result column="amt_total" property="amtTotal" />
-        <result column="abc" property="abc" />
-        <result column="subject_id" property="subjectId" />
-        <result column="begin_date" property="beginDate" />
-        <result column="end_date" property="endDate" />
-        <result column="rt_date" property="rtDate" />
-        <result column="content" property="content" />
-        <result column="progress" property="progress" />
-        <result column="cb_status" property="cbStatus" />
-        <result column="qy_date" property="qyDate" />
-        <result column="xj_date" property="xjDate" />
-        <result column="zj_date" property="zjDate" />
-        <result column="tc_date" property="tcDate" />
-        <result column="cb_num" property="cbNum" />
-        <result column="xj_num" property="xjNum" />
-        <result column="zj_num" property="zjNum" />
-        <result column="remark" property="remark" />
-        <result column="name_zrr" property="nameZrr" />
-        <result column="tel" property="tel" />
-        <result column="name_lead" property="nameLead" />
-        <result column="tel_lead" property="telLead" />
-        <result column="status" property="status" />
-        <result column="is_rg" property="isRg" />
-        <result column="rg_date" property="rgDate" />
-        <result column="create_user_id" property="createUserId" />
-        <result column="create_user_name" property="createUserName" />
-        <result column="create_time" property="createTime" />
-        <result column="last_update_user_id" property="lastUpdateUserId" />
-        <result column="last_update_user_name" property="lastUpdateUserName" />
-        <result column="last_update_time" property="lastUpdateTime" />
-        <result column="logic_delete_flag" property="logicDeleteFlag" />
-        <result column="status_lamp" property="statusLamp" />
-        <result column="kind_nature" property="kindNature" />
-    </resultMap>-->
-
     <select id="queryPage" resultType="com.rtrh.projects.modules.projects.po.SubInfoGxj">
         SELECT
         s.id,
@@ -597,35 +554,6 @@
             AND a.status = 1
             AND a.status_conf IN (1, 2);
     </select>
-    <select id="selectNewestMonthReport" resultType="com.rtrh.projects.modules.projects.po.RptCont">
-        SELECT
-            DISTINCT
-            src.sub_id AS subId,src.content
-        FROM
-            sub_rpt_cont src
-                JOIN (
-                SELECT
-                    sub_id,
-                    MAX(kj_month) AS latest_kj_month
-                FROM
-                    sub_rpt_cont
-                WHERE
-                    logic_delete_flag = 0
-                  AND sub_id IN
-                  <foreach collection="ids" item="item" separator="," open="(" close=")">
-                      #{item}
-                  </foreach>
-                  AND kind = '1'
-                  AND content IS NOT NULL
-                GROUP BY
-                    sub_id
-            ) AS latest_src ON src.sub_id = latest_src.sub_id
-                AND src.kj_month = latest_src.latest_kj_month
-        WHERE
-            src.logic_delete_flag = 0
-          AND src.kind = '1'
-          AND src.content IS NOT NULL
-    </select>
     <select id="exportFixCbDetailExcel" resultType="com.rtrh.projects.modules.projects.vo.export.SubInfoFixCbDetail">
         SELECT sub_info.id as id,
                sub_info.sub_name as subName,

projects-service/src/main/java/com/rtrh/projects/modules/projects/mapper/SubRptContMapper.java

@@ -1,6 +1,7 @@
 package com.rtrh.projects.modules.projects.mapper;
 
 import com.rtrh.core.repository.mybatis.MyBatisRepository;
+import com.rtrh.projects.modules.projects.po.RptCont;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -17,4 +18,6 @@ public interface SubRptContMapper {
     List<Map<String,Object>>  pageQueryMonthWarnData(Map<String, Object> params);
 
     String selectNewestMonthReportByIdAndKind(@Param("subId") String subId,@Param("kind") String kind);
+
+    List<RptCont> selectNewestMonthReport(@Param("ids") List<String> ids);
 }