Merge branch 'master' of http://192.168.2.4:3000/chengqiang/sg_audit

target/classes/act/build.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="act" default="welcome">
+
+	<!-- properties from key value -->
+	<property name="designs" value="designs" />
+	<property name="deployments" value="deployments" />
+
+	<!-- 显示欢迎信息以及操作提示 -->
+	<target name="welcome">
+		<echo>Activiti打包程序，请输入命令后操作！</echo>
+	</target>
+
+	<!-- 请假流程定义打包 -->
+	<target name="oa.leave">
+		<echo>打包流程定义：请假流程</echo>
+		<copy file="${designs}/oa/leave/leave.bpmn" tofile="${designs}/oa/leave/leave.bpmn20.xml" />
+		<zip destfile="${deployments}/oa/leave/leave.bar" basedir="${designs}/oa/leave" update="true" includes="*.xml,*.png" />
+		<delete file="${designs}/oa/leave/leave.bpmn20.xml" />
+	</target>
+	
+	<!-- 请假流程定义打包-自定义表单 -->
+	<target name="oa.test_audit">
+		<echo>打包流程定义：测试审核流程</echo>
+		<copy file="${designs}/oa/test_audit/test_audit.bpmn" tofile="${designs}/oa/test_audit/test_audit.bpmn20.xml" />
+		<zip destfile="${deployments}/oa/test_audit/test_audit.bar" basedir="${designs}/oa/test_audit" update="true" includes="*.xml,*.png" />
+		<delete file="${designs}/oa/test_audit/test_audit.bpmn20.xml" />
+	</target>
+
+</project>

target/classes/act/designs/oa/leave/leave.bpmn

@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:activiti="http://activiti.org/bpmn" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI" typeLanguage="http://www.w3.org/2001/XMLSchema" expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="com.thinkgem.jeesite.modules.oa.leave">
+  <process id="leave" name="请假流程" isExecutable="true">
+    <documentation>请假流程演示</documentation>
+    <startEvent id="startevent1" name="Start" activiti:initiator="applyUserId"></startEvent>
+    <userTask id="deptLeaderAudit" name="部门领导审批" activiti:candidateGroups="dept"></userTask>
+    <exclusiveGateway id="exclusivegateway5" name="Exclusive Gateway"></exclusiveGateway>
+    <userTask id="modifyApply" name="调整申请" activiti:assignee="${applyUserId}">
+      <extensionElements>
+        <activiti:taskListener event="complete" delegateExpression="${leaveModifyProcessor}"></activiti:taskListener>
+      </extensionElements>
+    </userTask>
+    <userTask id="hrAudit" name="人事审批" activiti:candidateGroups="hr"></userTask>
+    <exclusiveGateway id="exclusivegateway6" name="Exclusive Gateway"></exclusiveGateway>
+    <userTask id="reportBack" name="销假" activiti:assignee="${applyUserId}">
+      <extensionElements>
+        <activiti:taskListener event="complete" delegateExpression="${leaveReportProcessor}"></activiti:taskListener>
+      </extensionElements>
+    </userTask>
+    <endEvent id="endevent1" name="End"></endEvent>
+    <exclusiveGateway id="exclusivegateway7" name="Exclusive Gateway"></exclusiveGateway>
+    <sequenceFlow id="flow2" sourceRef="startevent1" targetRef="deptLeaderAudit"></sequenceFlow>
+    <sequenceFlow id="flow3" sourceRef="deptLeaderAudit" targetRef="exclusivegateway5"></sequenceFlow>
+    <sequenceFlow id="flow4" name="不同意" sourceRef="exclusivegateway5" targetRef="modifyApply">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${!deptLeaderPass}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="flow5" name="同意" sourceRef="exclusivegateway5" targetRef="hrAudit">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${deptLeaderPass}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="flow6" sourceRef="hrAudit" targetRef="exclusivegateway6"></sequenceFlow>
+    <sequenceFlow id="flow7" name="同意" sourceRef="exclusivegateway6" targetRef="reportBack">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${hrPass}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="flow8" sourceRef="reportBack" targetRef="endevent1"></sequenceFlow>
+    <sequenceFlow id="flow9" name="不同意" sourceRef="exclusivegateway6" targetRef="modifyApply">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${!hrPass}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="flow10" name="重新申请" sourceRef="exclusivegateway7" targetRef="deptLeaderAudit">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${reApply}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="flow11" sourceRef="modifyApply" targetRef="exclusivegateway7"></sequenceFlow>
+    <sequenceFlow id="flow12" name="结束流程" sourceRef="exclusivegateway7" targetRef="endevent1">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${!reApply}]]></conditionExpression>
+    </sequenceFlow>
+  </process>
+  <bpmndi:BPMNDiagram id="BPMNDiagram_leave">
+    <bpmndi:BPMNPlane bpmnElement="leave" id="BPMNPlane_leave">
+      <bpmndi:BPMNShape bpmnElement="startevent1" id="BPMNShape_startevent1">
+        <omgdc:Bounds height="35.0" width="35.0" x="10.0" y="90.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="deptLeaderAudit" id="BPMNShape_deptLeaderAudit">
+        <omgdc:Bounds height="55.0" width="105.0" x="90.0" y="80.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="exclusivegateway5" id="BPMNShape_exclusivegateway5">
+        <omgdc:Bounds height="40.0" width="40.0" x="250.0" y="87.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="modifyApply" id="BPMNShape_modifyApply">
+        <omgdc:Bounds height="55.0" width="105.0" x="218.0" y="190.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="hrAudit" id="BPMNShape_hrAudit">
+        <omgdc:Bounds height="55.0" width="105.0" x="358.0" y="80.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="exclusivegateway6" id="BPMNShape_exclusivegateway6">
+        <omgdc:Bounds height="40.0" width="40.0" x="495.0" y="87.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="reportBack" id="BPMNShape_reportBack">
+        <omgdc:Bounds height="55.0" width="105.0" x="590.0" y="80.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="endevent1" id="BPMNShape_endevent1">
+        <omgdc:Bounds height="35.0" width="35.0" x="625.0" y="283.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="exclusivegateway7" id="BPMNShape_exclusivegateway7">
+        <omgdc:Bounds height="40.0" width="40.0" x="250.0" y="280.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge bpmnElement="flow2" id="BPMNEdge_flow2">
+        <omgdi:waypoint x="45.0" y="107.0"></omgdi:waypoint>
+        <omgdi:waypoint x="90.0" y="107.0"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="flow3" id="BPMNEdge_flow3">
+        <omgdi:waypoint x="195.0" y="107.0"></omgdi:waypoint>
+        <omgdi:waypoint x="250.0" y="107.0"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="flow4" id="BPMNEdge_flow4">
+        <omgdi:waypoint x="270.0" y="127.0"></omgdi:waypoint>
+        <omgdi:waypoint x="270.0" y="190.0"></omgdi:waypoint>
+        <bpmndi:BPMNLabel>
+          <omgdc:Bounds height="14.0" width="36.0" x="10.0" y="0.0"></omgdc:Bounds>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="flow5" id="BPMNEdge_flow5">
+        <omgdi:waypoint x="290.0" y="107.0"></omgdi:waypoint>
+        <omgdi:waypoint x="358.0" y="107.0"></omgdi:waypoint>
+        <bpmndi:BPMNLabel>
+          <omgdc:Bounds height="14.0" width="24.0" x="-24.0" y="-17.0"></omgdc:Bounds>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="flow6" id="BPMNEdge_flow6">
+        <omgdi:waypoint x="463.0" y="107.0"></omgdi:waypoint>
+        <omgdi:waypoint x="495.0" y="107.0"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="flow7" id="BPMNEdge_flow7">
+        <omgdi:waypoint x="535.0" y="107.0"></omgdi:waypoint>
+        <omgdi:waypoint x="590.0" y="107.0"></omgdi:waypoint>
+        <bpmndi:BPMNLabel>
+          <omgdc:Bounds height="14.0" width="24.0" x="-22.0" y="-17.0"></omgdc:Bounds>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="flow8" id="BPMNEdge_flow8">
+        <omgdi:waypoint x="642.0" y="135.0"></omgdi:waypoint>
+        <omgdi:waypoint x="642.0" y="283.0"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="flow9" id="BPMNEdge_flow9">
+        <omgdi:waypoint x="515.0" y="127.0"></omgdi:waypoint>
+        <omgdi:waypoint x="514.0" y="217.0"></omgdi:waypoint>
+        <omgdi:waypoint x="323.0" y="217.0"></omgdi:waypoint>
+        <bpmndi:BPMNLabel>
+          <omgdc:Bounds height="14.0" width="36.0" x="24.0" y="3.0"></omgdc:Bounds>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="flow10" id="BPMNEdge_flow10">
+        <omgdi:waypoint x="250.0" y="300.0"></omgdi:waypoint>
+        <omgdi:waypoint x="142.0" y="299.0"></omgdi:waypoint>
+        <omgdi:waypoint x="142.0" y="135.0"></omgdi:waypoint>
+        <bpmndi:BPMNLabel>
+          <omgdc:Bounds height="14.0" width="48.0" x="8.0" y="-1.0"></omgdc:Bounds>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="flow11" id="BPMNEdge_flow11">
+        <omgdi:waypoint x="270.0" y="245.0"></omgdi:waypoint>
+        <omgdi:waypoint x="270.0" y="280.0"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="flow12" id="BPMNEdge_flow12">
+        <omgdi:waypoint x="290.0" y="300.0"></omgdi:waypoint>
+        <omgdi:waypoint x="625.0" y="300.0"></omgdi:waypoint>
+        <bpmndi:BPMNLabel>
+          <omgdc:Bounds height="14.0" width="48.0" x="-15.0" y="-20.0"></omgdc:Bounds>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+    </bpmndi:BPMNPlane>
+  </bpmndi:BPMNDiagram>
+</definitions>

target/classes/act/designs/oa/test_audit/test_audit.bpmn

@@ -0,0 +1,171 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:activiti="http://activiti.org/bpmn" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI" typeLanguage="http://www.w3.org/2001/XMLSchema" expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://www.activiti.org/test">
+  <process id="test_audit" name="�程审批测试�程" isExecutable="true">
+    <startEvent id="start" name="�动审批" activiti:initiator="apply" activiti:formKey="/oa/testAudit/form"/>
+    <endEvent id="end" name="结�审批"/>
+    <userTask id="modify" name="员工薪酬档级修改" activiti:assignee="${apply}"/>
+    <userTask id="audit" name="薪酬主管�审" activiti:assignee="system"/>
+    <exclusiveGateway id="sid-C28BB5F6-013D-4570-B432-61B380C1F46F"/>
+    <userTask id="audit2" name="集团人力资�部部长审�" activiti:assignee="system"/>
+    <exclusiveGateway id="sid-ED46FE41-A0FD-496D-86DC-2C97AF5735F0"/>
+    <sequenceFlow id="sid-EF2F51BB-1D99-4F0B-ACF2-B6C1300A7D2B" sourceRef="audit2" targetRef="sid-ED46FE41-A0FD-496D-86DC-2C97AF5735F0"/>
+    <userTask id="audit3" name="集团人力资�部分管领导审�" activiti:assignee="system"/>
+    <exclusiveGateway id="sid-FE485B2D-9A23-4236-BD0D-D788CA6E30E4"/>
+    <sequenceFlow id="sid-3DBCD661-5720-4480-8156-748BE0275FEF" sourceRef="audit3" targetRef="sid-FE485B2D-9A23-4236-BD0D-D788CA6E30E4"/>
+    <userTask id="audit4" name="集团总��审�" activiti:assignee="system"/>
+    <exclusiveGateway id="sid-3F53B6BD-F8F3-496B-AC08-50630BD11477"/>
+    <userTask id="apply_end" name="薪酬档级兑现" activiti:assignee="system"/>
+    <sequenceFlow id="sid-02DB2AD9-1332-4198-AC8D-22A35169D15C" sourceRef="audit4" targetRef="sid-3F53B6BD-F8F3-496B-AC08-50630BD11477"/>
+    <sequenceFlow id="sid-2AB7C01A-50EE-4AAC-8C8F-F6E1935B3DA7" sourceRef="audit" targetRef="sid-C28BB5F6-013D-4570-B432-61B380C1F46F"/>
+    <sequenceFlow id="sid-36E50C8B-6C7C-4968-B02D-EBAA425BF4BE" sourceRef="start" targetRef="audit"/>
+    <sequenceFlow id="sid-7D723190-1432-411D-A4A4-774225E54CD9" name="�" sourceRef="sid-3F53B6BD-F8F3-496B-AC08-50630BD11477" targetRef="apply_end">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${pass==1}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-D44CAD43-0271-4920-A524-9B8533E52550" name="�" sourceRef="sid-FE485B2D-9A23-4236-BD0D-D788CA6E30E4" targetRef="audit4">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${pass==1}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-53258502-43EE-4DE8-B1A4-DBD11922B8AF" name="�" sourceRef="sid-C28BB5F6-013D-4570-B432-61B380C1F46F" targetRef="modify">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${pass==0}]]></conditionExpression>
+    </sequenceFlow>
+    <exclusiveGateway id="sid-5FED02D6-C388-48C6-870E-097DB2131EA0"/>
+    <sequenceFlow id="sid-163DBC60-DBC9-438B-971A-67738FB7715A" sourceRef="modify" targetRef="sid-5FED02D6-C388-48C6-870E-097DB2131EA0"/>
+    <sequenceFlow id="sid-72258A41-203E-428C-B71D-CA3506252D73" name="�" sourceRef="sid-C28BB5F6-013D-4570-B432-61B380C1F46F" targetRef="audit2">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${pass==1}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-8448EF4A-B62E-4899-ABC2-0E2DB2AE6838" name="�新申请" sourceRef="sid-5FED02D6-C388-48C6-870E-097DB2131EA0" targetRef="audit">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${pass==1}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-A7589084-4623-4FEA-A774-00A70DDC1D20" name="�" sourceRef="sid-ED46FE41-A0FD-496D-86DC-2C97AF5735F0" targetRef="audit3">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${pass==1}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-FA618636-3708-4D0C-8514-29A4BB8BC926" name="�" sourceRef="sid-ED46FE41-A0FD-496D-86DC-2C97AF5735F0" targetRef="modify">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${pass==0}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-1525BFF4-3E9D-4D8A-BF80-1F63AFE16289" name="�" sourceRef="sid-FE485B2D-9A23-4236-BD0D-D788CA6E30E4" targetRef="modify">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${pass==0}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-35CC8C6C-1067-4398-991C-CCF955115965" name="�" sourceRef="sid-3F53B6BD-F8F3-496B-AC08-50630BD11477" targetRef="modify">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${pass==0}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="sid-BDB0AAB2-7E50-4D35-80EE-CE0BECDD9F57" sourceRef="apply_end" targetRef="end"/>
+    <sequenceFlow id="sid-44AFB9C1-4057-4C48-B1F2-1EC897A52CB7" name="��" sourceRef="sid-5FED02D6-C388-48C6-870E-097DB2131EA0" targetRef="end">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${pass==0}]]></conditionExpression>
+    </sequenceFlow>
+  </process>
+  <bpmndi:BPMNDiagram id="BPMNDiagram_test_audit">
+    <bpmndi:BPMNPlane bpmnElement="test_audit" id="BPMNPlane_test_audit">
+      <bpmndi:BPMNShape bpmnElement="start" id="BPMNShape_start">
+        <omgdc:Bounds height="30.0" width="30.0" x="30.0" y="245.0"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="end" id="BPMNShape_end">
+        <omgdc:Bounds height="28.0" width="28.0" x="975.0" y="356.0"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="modify" id="BPMNShape_modify">
+        <omgdc:Bounds height="58.0" width="102.0" x="209.0" y="135.0"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="audit" id="BPMNShape_audit">
+        <omgdc:Bounds height="57.0" width="96.0" x="105.0" y="231.5"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-C28BB5F6-013D-4570-B432-61B380C1F46F" id="BPMNShape_sid-C28BB5F6-013D-4570-B432-61B380C1F46F">
+        <omgdc:Bounds height="40.0" width="40.0" x="240.0" y="240.0"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="audit2" id="BPMNShape_audit2">
+        <omgdc:Bounds height="80.0" width="100.0" x="210.0" y="330.0"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-ED46FE41-A0FD-496D-86DC-2C97AF5735F0" id="BPMNShape_sid-ED46FE41-A0FD-496D-86DC-2C97AF5735F0">
+        <omgdc:Bounds height="40.0" width="40.0" x="345.0" y="350.0"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="audit3" id="BPMNShape_audit3">
+        <omgdc:Bounds height="80.0" width="100.0" x="420.0" y="330.0"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-FE485B2D-9A23-4236-BD0D-D788CA6E30E4" id="BPMNShape_sid-FE485B2D-9A23-4236-BD0D-D788CA6E30E4">
+        <omgdc:Bounds height="40.0" width="40.0" x="555.0" y="350.0"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="audit4" id="BPMNShape_audit4">
+        <omgdc:Bounds height="80.0" width="100.0" x="630.0" y="330.0"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-3F53B6BD-F8F3-496B-AC08-50630BD11477" id="BPMNShape_sid-3F53B6BD-F8F3-496B-AC08-50630BD11477">
+        <omgdc:Bounds height="40.0" width="40.0" x="765.0" y="350.0"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="apply_end" id="BPMNShape_apply_end">
+        <omgdc:Bounds height="80.0" width="100.0" x="840.0" y="330.0"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="sid-5FED02D6-C388-48C6-870E-097DB2131EA0" id="BPMNShape_sid-5FED02D6-C388-48C6-870E-097DB2131EA0">
+        <omgdc:Bounds height="40.0" width="40.0" x="240.0" y="45.0"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge bpmnElement="sid-3DBCD661-5720-4480-8156-748BE0275FEF" id="BPMNEdge_sid-3DBCD661-5720-4480-8156-748BE0275FEF">
+        <omgdi:waypoint x="520.0" y="370.0"/>
+        <omgdi:waypoint x="555.0" y="370.0"/>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-44AFB9C1-4057-4C48-B1F2-1EC897A52CB7" id="BPMNEdge_sid-44AFB9C1-4057-4C48-B1F2-1EC897A52CB7">
+        <omgdi:waypoint x="280.0" y="65.0"/>
+        <omgdi:waypoint x="989.0" y="65.0"/>
+        <omgdi:waypoint x="989.0" y="356.0"/>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-8448EF4A-B62E-4899-ABC2-0E2DB2AE6838" id="BPMNEdge_sid-8448EF4A-B62E-4899-ABC2-0E2DB2AE6838">
+        <omgdi:waypoint x="240.0" y="65.0"/>
+        <omgdi:waypoint x="153.0" y="65.0"/>
+        <omgdi:waypoint x="153.0" y="231.5"/>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-A7589084-4623-4FEA-A774-00A70DDC1D20" id="BPMNEdge_sid-A7589084-4623-4FEA-A774-00A70DDC1D20">
+        <omgdi:waypoint x="385.0" y="370.0"/>
+        <omgdi:waypoint x="420.0" y="370.0"/>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-35CC8C6C-1067-4398-991C-CCF955115965" id="BPMNEdge_sid-35CC8C6C-1067-4398-991C-CCF955115965">
+        <omgdi:waypoint x="785.0" y="350.0"/>
+        <omgdi:waypoint x="785.0" y="164.0"/>
+        <omgdi:waypoint x="311.0" y="164.0"/>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-EF2F51BB-1D99-4F0B-ACF2-B6C1300A7D2B" id="BPMNEdge_sid-EF2F51BB-1D99-4F0B-ACF2-B6C1300A7D2B">
+        <omgdi:waypoint x="310.0" y="370.0"/>
+        <omgdi:waypoint x="345.0" y="370.0"/>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-7D723190-1432-411D-A4A4-774225E54CD9" id="BPMNEdge_sid-7D723190-1432-411D-A4A4-774225E54CD9">
+        <omgdi:waypoint x="805.0" y="370.0"/>
+        <omgdi:waypoint x="840.0" y="370.0"/>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-2AB7C01A-50EE-4AAC-8C8F-F6E1935B3DA7" id="BPMNEdge_sid-2AB7C01A-50EE-4AAC-8C8F-F6E1935B3DA7">
+        <omgdi:waypoint x="201.0" y="260.0"/>
+        <omgdi:waypoint x="240.0" y="260.0"/>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-D44CAD43-0271-4920-A524-9B8533E52550" id="BPMNEdge_sid-D44CAD43-0271-4920-A524-9B8533E52550">
+        <omgdi:waypoint x="595.0" y="370.0"/>
+        <omgdi:waypoint x="630.0" y="370.0"/>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-FA618636-3708-4D0C-8514-29A4BB8BC926" id="BPMNEdge_sid-FA618636-3708-4D0C-8514-29A4BB8BC926">
+        <omgdi:waypoint x="365.0" y="350.0"/>
+        <omgdi:waypoint x="365.0" y="164.0"/>
+        <omgdi:waypoint x="311.0" y="164.0"/>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-02DB2AD9-1332-4198-AC8D-22A35169D15C" id="BPMNEdge_sid-02DB2AD9-1332-4198-AC8D-22A35169D15C">
+        <omgdi:waypoint x="730.0" y="370.0"/>
+        <omgdi:waypoint x="765.0" y="370.0"/>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-36E50C8B-6C7C-4968-B02D-EBAA425BF4BE" id="BPMNEdge_sid-36E50C8B-6C7C-4968-B02D-EBAA425BF4BE">
+        <omgdi:waypoint x="60.0" y="260.0"/>
+        <omgdi:waypoint x="105.0" y="260.0"/>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-53258502-43EE-4DE8-B1A4-DBD11922B8AF" id="BPMNEdge_sid-53258502-43EE-4DE8-B1A4-DBD11922B8AF">
+        <omgdi:waypoint x="260.0" y="240.0"/>
+        <omgdi:waypoint x="260.0" y="193.0"/>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-163DBC60-DBC9-438B-971A-67738FB7715A" id="BPMNEdge_sid-163DBC60-DBC9-438B-971A-67738FB7715A">
+        <omgdi:waypoint x="260.0" y="135.0"/>
+        <omgdi:waypoint x="260.0" y="85.0"/>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-BDB0AAB2-7E50-4D35-80EE-CE0BECDD9F57" id="BPMNEdge_sid-BDB0AAB2-7E50-4D35-80EE-CE0BECDD9F57">
+        <omgdi:waypoint x="940.0" y="370.0"/>
+        <omgdi:waypoint x="975.0" y="370.0"/>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-1525BFF4-3E9D-4D8A-BF80-1F63AFE16289" id="BPMNEdge_sid-1525BFF4-3E9D-4D8A-BF80-1F63AFE16289">
+        <omgdi:waypoint x="575.0" y="350.0"/>
+        <omgdi:waypoint x="575.0" y="164.0"/>
+        <omgdi:waypoint x="311.0" y="164.0"/>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-72258A41-203E-428C-B71D-CA3506252D73" id="BPMNEdge_sid-72258A41-203E-428C-B71D-CA3506252D73">
+        <omgdi:waypoint x="260.0" y="280.0"/>
+        <omgdi:waypoint x="260.0" y="330.0"/>
+      </bpmndi:BPMNEdge>
+    </bpmndi:BPMNPlane>
+  </bpmndi:BPMNDiagram>
+</definitions>

target/classes/com/jeeplus/modules/act/mapper/xml/ActMapper.xml

@@ -0,0 +1,11 @@
+<?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.jeeplus.modules.act.mapper.ActMapper">
+    
+	<update id="updateProcInsIdByBusinessId">
+		UPDATE ${businessTable} SET 
+			proc_ins_id = #{procInsId}
+		WHERE id = #{businessId}
+	</update>
+	
+</mapper>

target/classes/com/jeeplus/modules/echarts/mapper/xml/other/TestPieClassMapper.xml

@@ -0,0 +1,122 @@
+<?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.jeeplus.modules.echarts.mapper.other.TestPieClassMapper">
+    
+	<sql id="testPieClassColumns">
+		a.id AS "id",
+		a.create_by AS "createBy.id",
+		a.create_date AS "createDate",
+		a.update_by AS "updateBy.id",
+		a.update_date AS "updateDate",
+		a.del_flag AS "delFlag",
+		a.class_name AS "className",
+		a.num AS "num",
+		a.remarks AS "remarks"
+	</sql>
+	
+	<sql id="testPieClassJoins">
+		
+	</sql>
+	
+    
+	<select id="get" resultType="TestPieClass" >
+		SELECT 
+			<include refid="testPieClassColumns"/>
+		FROM test_pie_class a
+		<include refid="testPieClassJoins"/>
+		WHERE a.id = #{id}
+	</select>
+	
+	<select id="findList" resultType="TestPieClass" >
+		SELECT 
+			<include refid="testPieClassColumns"/>
+		FROM test_pie_class a
+		<include refid="testPieClassJoins"/>
+		<where>
+			a.del_flag = #{DEL_FLAG_NORMAL}
+			${dataScope}
+		</where>
+		<choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+				ORDER BY a.update_date DESC
+			</otherwise>
+		</choose>
+	</select>
+	
+	<select id="findAllList" resultType="TestPieClass" >
+		SELECT 
+			<include refid="testPieClassColumns"/>
+		FROM test_pie_class a
+		<include refid="testPieClassJoins"/>
+		<where>
+			a.del_flag = #{DEL_FLAG_NORMAL}
+			${dataScope}
+		</where>		
+		<choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+				ORDER BY a.update_date DESC
+			</otherwise>
+		</choose>
+	</select>
+	
+	<insert id="insert">
+		INSERT INTO test_pie_class(
+			id,
+			create_by,
+			create_date,
+			update_by,
+			update_date,
+			del_flag,
+			class_name,
+			num,
+			remarks
+		) VALUES (
+			#{id},
+			#{createBy.id},
+			#{createDate},
+			#{updateBy.id},
+			#{updateDate},
+			#{delFlag},
+			#{className},
+			#{num},
+			#{remarks}
+		)
+	</insert>
+	
+	<update id="update">
+		UPDATE test_pie_class SET 	
+			update_by = #{updateBy.id},
+			update_date = #{updateDate},
+			class_name = #{className},
+			num = #{num},
+			remarks = #{remarks}
+		WHERE id = #{id}
+	</update>
+	
+	
+	<!--物理删除-->
+	<update id="delete">
+		DELETE FROM test_pie_class
+		WHERE id = #{id}
+	</update>
+	
+	<!--逻辑删除-->
+	<update id="deleteByLogic">
+		UPDATE test_pie_class SET 
+			del_flag = #{DEL_FLAG_DELETE}
+		WHERE id = #{id}
+	</update>
+	
+	
+	<!-- 根据实体名称和字段名称和字段值获取唯一记录 -->
+	<select id="findUniqueByProperty" resultType="TestPieClass" statementType="STATEMENT">
+		select * FROM test_pie_class  where ${propertyName} = '${value}'
+	</select>
+	
+</mapper>

target/classes/com/jeeplus/modules/iim/mapper/xml/ChatHistoryMapper.xml

@@ -0,0 +1,174 @@
+<?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.jeeplus.modules.iim.mapper.ChatHistoryMapper">
+    
+	<sql id="chatHistoryColumns">
+		a.id AS "id",
+		a.sender AS "sender",
+		a.receiver AS "receiver",
+		a.msg AS "msg",
+		a.status AS "status",
+		a.create_date AS "createDate",
+		a.type AS "type"
+	</sql>
+	
+	<sql id="chatHistoryJoins">
+	</sql>
+    
+	<select id="get" resultType="ChatHistory">
+		SELECT 
+			<include refid="chatHistoryColumns"/>
+		FROM iim_chat_history a
+		<include refid="chatHistoryJoins"/>
+		WHERE a.id = #{id}
+	</select>
+	
+	<select id="findList" resultType="ChatHistory">
+		SELECT 
+			<include refid="chatHistoryColumns"/>
+		FROM iim_chat_history a
+		<include refid="chatHistoryJoins"/>
+		<where>
+			
+			<if test="sender != null and sender != ''">
+				AND a.sender = #{sender}
+			</if>
+			<if test="receiver != null and receiver != ''">
+				AND a.receiver = #{receiver}
+			</if>
+			<if test="msg != null and msg != ''">
+				AND a.msg LIKE 
+					<if test="dbName == 'oracle'">'%'||#{msg}||'%'</if>
+					<if test="dbName == 'mssql'">'%'+#{msg}+'%'</if>
+					<if test="dbName == 'mysql'">concat('%',#{msg},'%')</if>
+			</if>
+			<if test="status != null and status != ''">
+				AND a.status = #{status}
+			</if>
+			<if test="createDate != null and createDate != ''">
+				AND a.create_date = #{createDate}
+			</if>
+		</where>
+				ORDER BY a.create_date asc
+	</select>
+	
+	<select id="findLogList" resultType="ChatHistory">
+		SELECT 
+			<include refid="chatHistoryColumns"/>
+		FROM iim_chat_history a
+		<include refid="chatHistoryJoins"/>
+		<where>
+			
+			<if test="sender != null and sender != '' and receiver != null and receiver != ''">
+				AND  ((a.sender = #{sender} AND a.receiver = #{receiver}) or  (a.sender = #{receiver} AND a.receiver = #{sender}))
+			</if>
+			<if test="msg != null and msg != ''">
+				AND a.msg LIKE 
+					<if test="dbName == 'oracle'">'%'||#{msg}||'%'</if>
+					<if test="dbName == 'mssql'">'%'+#{msg}+'%'</if>
+					<if test="dbName == 'mysql'">concat('%',#{msg},'%')</if>
+			</if>
+			<if test="status != null and status != ''">
+				AND a.status = #{status}
+			</if>
+			<if test="createDate != null and createDate != ''">
+				AND a.create_date = #{createDate}
+			</if>
+		</where>
+				ORDER BY a.create_date desc
+	</select>
+	
+	<select id="findGroupLogList" resultType="ChatHistory">
+		SELECT 
+			<include refid="chatHistoryColumns"/>
+		FROM iim_chat_history a
+		<include refid="chatHistoryJoins"/>
+		<where>
+			
+			<if test="sender != null and sender != '' and receiver != null and receiver != ''">
+				AND  
+					((a.sender =
+					<if test="dbName == 'oracle'">#{receiver}||'_msg_'||#{sender}</if>
+					<if test="dbName == 'mssql'">#{receiver}+'_msg_'+#{sender}</if>
+					<if test="dbName == 'mysql'">concat(#{receiver},'_msg_',#{sender})</if>
+				     AND  a.receiver = #{sender})
+					
+					OR (a.sender like
+					<if test="dbName == 'oracle'">#{receiver}||'_msg_'||'%'</if>
+					<if test="dbName == 'mssql'">#{receiver}+'_msg_'+'%'</if>
+					<if test="dbName == 'mysql'">concat(#{receiver},'_msg_','%')</if>
+					and a.receiver = #{sender}))
+
+			</if>
+			<if test="msg != null and msg != ''">
+				AND a.msg LIKE 
+					<if test="dbName == 'oracle'">'%'||#{msg}||'%'</if>
+					<if test="dbName == 'mssql'">'%'+#{msg}+'%'</if>
+					<if test="dbName == 'mysql'">concat('%',#{msg},'%')</if>
+			</if>
+			<if test="status != null and status != ''">
+				AND a.status = #{status}
+			</if>
+			<if test="createDate != null and createDate != ''">
+				AND a.create_date = #{createDate}
+			</if>
+		</where>
+				ORDER BY a.create_date desc
+	</select>
+	<select id="findAllList" resultType="ChatHistory">
+		SELECT 
+			<include refid="chatHistoryColumns"/>
+		FROM iim_chat_history a
+		<include refid="chatHistoryJoins"/>
+		<where>
+			
+		</where>		
+		ORDER BY a.create_date asc
+	</select>
+	
+	<insert id="insert">
+		INSERT INTO iim_chat_history(
+			id,
+			sender,
+			receiver,
+			msg,
+			status,
+			create_date,
+			type
+		) VALUES (
+			#{id},
+			#{sender},
+			#{receiver},
+			#{msg},
+			#{status},
+			#{createDate},
+			#{type}
+		)
+	</insert>
+	
+	<update id="update">
+		UPDATE iim_chat_history SET 	
+			sender = #{sender},
+			receiver = #{receiver},
+			msg = #{msg},
+			status = #{status},
+			create_date = #{createDate},
+			type = #{type}
+		WHERE id = #{id}
+	</update>
+	
+	<update id="delete">
+		DELETE FROM iim_chat_history
+		WHERE id = #{id}
+	</update>
+	
+	<!-- 查询全部用户数目 -->
+	<select id="findUnReadCount" resultType="int">
+		SELECT
+			COUNT(1)
+		FROM iim_chat_history a WHERE
+				a.sender = #{receiver} AND a.receiver = #{sender}
+				AND a.status = '0'
+	</select>
+	
+</mapper>

target/classes/com/jeeplus/modules/iim/mapper/xml/LayGroupMapper.xml

@@ -0,0 +1,126 @@
+<?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.jeeplus.modules.iim.mapper.LayGroupMapper">
+    
+	<sql id="layGroupColumns">
+		a.id AS "id",
+		a.groupname AS "groupname",
+		a.avatar AS "avatar",
+		a.create_by AS "createBy.id",
+		a.create_date AS "createDate",
+		a.update_by AS "updateBy.id",
+		a.update_date AS "updateDate",
+		a.remarks AS "remarks",
+		a.del_flag AS "delFlag",
+		t_user.name AS "createBy.name",
+		t_user.photo AS "createBy.photo",
+		t_user.login_name AS "createBy.loginName"
+	</sql>
+	
+	<sql id="layGroupJoins">
+	LEFT JOIN sys_user t_user ON t_user.id = a.create_by
+	</sql>
+	
+    
+	<select id="get" resultType="LayGroup" >
+		SELECT 
+			<include refid="layGroupColumns"/>
+		FROM t_group a
+		<include refid="layGroupJoins"/>
+		WHERE a.id = #{id}
+	</select>
+	
+	<select id="findList" resultType="LayGroup" >
+		SELECT 
+			<include refid="layGroupColumns"/>
+		FROM t_group a
+		<include refid="layGroupJoins"/>
+		<where>
+			a.del_flag = #{DEL_FLAG_NORMAL}
+			<if test="createBy != null and createBy.id != null and createBy.id != ''">
+				AND a.create_by = #{createBy.id}
+			</if>
+		</where>
+		<choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+				ORDER BY a.update_date DESC
+			</otherwise>
+		</choose>
+	</select>
+	
+	<select id="findAllList" resultType="LayGroup" >
+		SELECT 
+			<include refid="layGroupColumns"/>
+		FROM t_group a
+		<include refid="layGroupJoins"/>
+		<where>
+			a.del_flag = #{DEL_FLAG_NORMAL}
+		</where>		
+		<choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+				ORDER BY a.update_date DESC
+			</otherwise>
+		</choose>
+	</select>
+	
+	<insert id="insert">
+		INSERT INTO t_group(
+			id,
+			groupname,
+			avatar,
+			create_by,
+			create_date,
+			update_by,
+			update_date,
+			remarks,
+			del_flag
+		) VALUES (
+			#{id},
+			#{groupname},
+			#{avatar},
+			#{createBy.id},
+			#{createDate},
+			#{updateBy.id},
+			#{updateDate},
+			#{remarks},
+			#{delFlag}
+		)
+	</insert>
+	
+	<update id="update">
+		UPDATE t_group SET 	
+			groupname = #{groupname},
+			avatar = #{avatar},
+			update_by = #{updateBy.id},
+			update_date = #{updateDate},
+			remarks = #{remarks}
+		WHERE id = #{id}
+	</update>
+	
+	
+	<!--物理删除-->
+	<update id="delete">
+		DELETE FROM t_group
+		WHERE id = #{id}
+	</update>
+	
+	<!--逻辑删除-->
+	<update id="deleteByLogic">
+		UPDATE t_group SET 
+			del_flag = #{DEL_FLAG_DELETE}
+		WHERE id = #{id}
+	</update>
+	
+	
+	<!-- 根据实体名称和字段名称和字段值获取唯一记录 -->
+	<select id="findUniqueByProperty" resultType="LayGroup" statementType="STATEMENT">
+		select * FROM t_group  where ${propertyName} = '${value}'
+	</select>
+	
+</mapper>

target/classes/com/jeeplus/modules/iim/mapper/xml/LayGroupUserMapper.xml

@@ -0,0 +1,144 @@
+<?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.jeeplus.modules.iim.mapper.LayGroupUserMapper">
+    
+	<sql id="layGroupUserColumns">
+		a.id AS "id",
+		a.create_by AS "createBy.id",
+		a.create_date AS "createDate",
+		a.update_by AS "updateBy.id",
+		a.update_date AS "updateDate",
+		a.remarks AS "remarks",
+		a.del_flag AS "delFlag",
+		a.user_id AS "user.id",
+		a.group_id AS "group.id",
+		t_user.name AS "user.name",
+		t_user.photo AS "user.photo",
+		t_user.login_name AS "user.loginName"
+	</sql>
+	
+	<sql id="layGroupUserJoins">
+		LEFT JOIN t_group b ON b.id = a.group_id
+		LEFT JOIN sys_user t_user ON t_user.id = a.user_id
+	</sql>
+	
+    
+	<select id="get" resultType="LayGroupUser" >
+		SELECT 
+			<include refid="layGroupUserColumns"/>
+		FROM group_user a
+		<include refid="layGroupUserJoins"/>
+		WHERE a.id = #{id}
+	</select>
+	
+	<select id="findList" resultType="LayGroupUser" >
+		SELECT 
+			<include refid="layGroupUserColumns"/>
+		FROM group_user a
+		<include refid="layGroupUserJoins"/>
+		<where>
+			a.del_flag = #{DEL_FLAG_NORMAL}
+			<if test="user != null and user.id != null and user.id != ''">
+				AND a.user_id = #{user.id}
+			</if>
+			<if test="group != null and group.id != null and group.id != ''">
+				AND a.group_id = #{group.id}
+			</if>
+		</where>
+		<choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+				ORDER BY a.create_date ASC
+			</otherwise>
+		</choose>
+	</select>
+	
+	<select id="findAllList" resultType="LayGroupUser" >
+		SELECT 
+			<include refid="layGroupUserColumns"/>
+		FROM group_user a
+		<include refid="layGroupUserJoins"/>
+		<where>
+			a.del_flag = #{DEL_FLAG_NORMAL}
+		</where>		
+		<choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+				ORDER BY a.create_date ASC
+			</otherwise>
+		</choose>
+	</select>
+	
+	<insert id="insert">
+		INSERT INTO group_user(
+			id,
+			create_by,
+			create_date,
+			update_by,
+			update_date,
+			remarks,
+			del_flag,
+			user_id,
+			group_id
+		) VALUES (
+			#{id},
+			#{createBy.id},
+			#{createDate},
+			#{updateBy.id},
+			#{updateDate},
+			#{remarks},
+			#{delFlag},
+			#{user.id},
+			#{group.id}
+		)
+	</insert>
+	
+	<update id="update">
+		UPDATE group_user SET 	
+			update_by = #{updateBy.id},
+			update_date = #{updateDate},
+			remarks = #{remarks},
+			user_id = #{user.id},
+			group_id = #{group.id}
+		WHERE id = #{id}
+	</update>
+	
+	
+	<!--物理删除-->
+	<update id="delete">
+		DELETE FROM group_user
+		<choose>
+			<when test="id !=null and id != ''">
+				WHERE id = #{id}
+			</when>
+			<otherwise>
+				WHERE group_id = #{group.id}
+			</otherwise>
+		</choose>
+	</update>
+	
+	<!--逻辑删除-->
+	<update id="deleteByLogic">
+		UPDATE group_user SET 
+			del_flag = #{DEL_FLAG_DELETE}
+		<choose>
+			<when test="id !=null and id != ''">
+				WHERE id = #{id}
+			</when>
+			<otherwise>
+				WHERE group_id = #{group.id}
+			</otherwise>
+		</choose>
+	</update>
+	
+	
+	<!-- 根据实体名称和字段名称和字段值获取唯一记录 -->
+	<select id="findUniqueByProperty" resultType="LayGroupUser" statementType="STATEMENT">
+		select * FROM group_user  where ${propertyName} = '${value}'
+	</select>
+	
+</mapper>

target/classes/com/jeeplus/modules/iim/mapper/xml/MailBoxMapper.xml

@@ -0,0 +1,158 @@
+<?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.jeeplus.modules.iim.mapper.MailBoxMapper">
+    
+	<sql id="mailBoxColumns">
+		a.id AS "id",
+		a.readstatus AS "readstatus",
+		a.senderid AS "sender.id",
+		a.receiverid AS "receiver.id",
+		a.sendtime AS "sendtime",
+		a.mailid AS "mail.id",
+		receiver.name AS "receiver.name",
+		sender.name AS "sender.name",
+		sender.photo AS "sender.photo",
+		mail.title AS "mail.title",
+		mail.overview AS "mail.overview",
+		mail.content AS "mail.content"
+	</sql>
+	
+	<sql id="mailBoxJoins">
+		LEFT JOIN iim_mail mail ON mail.id = a.mailid
+		LEFT JOIN sys_user receiver ON receiver.id = a.receiverid
+		LEFT JOIN sys_user sender ON sender.id = a.senderid
+	</sql>
+     <resultMap type="MailBox" id="MailMap" autoMapping="true">
+    	<association property="mail"  javaType="Mail">
+			<id property="id" column="mail.id"/>
+			<result property="title" column="mail.title"/>
+			<result property="overview" column="mail.overview"/>
+			<result property="content" column="mail.content" typeHandler="com.jeeplus.core.mapper.ConvertBlobTypeHandler"/>
+		</association>
+	</resultMap>
+	<select id="get" resultMap="MailMap">
+		SELECT 
+			<include refid="mailBoxColumns"/>
+		FROM iim_mail_box a
+		<include refid="mailBoxJoins"/>
+		WHERE a.id = #{id}
+	</select>
+	
+	<select id="findList" resultType="MailBox">
+		SELECT 
+			<include refid="mailBoxColumns"/>
+		FROM iim_mail_box a
+		<include refid="mailBoxJoins"/>
+		<where>
+			<if test="receiver != null and receiver.id != null and receiver.id != ''">
+				AND a.receiverid = #{receiver.id}
+			</if>
+			<if test="readstatus != null and readstatus != ''">
+				AND a.readstatus = #{readstatus}
+			</if>
+			<if test="mail != null and mail.title != null and mail.title != ''">
+				AND ( mail.title like 
+					<if test="dbName == 'oracle'">'%'||#{mail.title}||'%'</if>
+					<if test="dbName == 'mysql'">CONCAT('%', #{mail.title}, '%')</if>
+					or 
+					mail.content like
+					<if test="dbName == 'oracle'">'%'||#{mail.title}||'%'</if>
+					<if test="dbName == 'mysql'">CONCAT('%', #{mail.title}, '%')</if>
+					)
+			</if>
+		</where>
+		<choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+			</otherwise>
+		</choose>
+	</select>
+	
+	<select id="findAllList" resultType="MailBox">
+		SELECT 
+			<include refid="mailBoxColumns"/>
+		FROM iim_mail_box a
+		<include refid="mailBoxJoins"/>
+		<where>
+			
+		</where>		
+		<choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+			</otherwise>
+		</choose>
+	</select>
+	
+	<select id="getCount" resultType="java.lang.Integer">
+		SELECT count(*)
+		FROM iim_mail_box a
+		<include refid="mailBoxJoins"/>
+		<where>
+			<if test="receiver != null and receiver.id != null and receiver.id != ''">
+				AND a.receiverid = #{receiver.id}
+			</if>
+			
+			<if test="readstatus !=null and readstatus != ''">
+				and a.readstatus = #{readstatus}
+			</if>
+		</where>		
+	
+	</select>
+	
+	<insert id="insert">
+		INSERT INTO iim_mail_box(
+			id,
+			readstatus,
+			senderid,
+			receiverid,
+			sendtime,
+			mailid
+		) VALUES (
+			#{id},
+			#{readstatus},
+			#{sender.id},
+			#{receiver.id},
+			#{sendtime},
+			#{mail.id}
+		)
+	</insert>
+	
+	<update id="update">
+		UPDATE iim_mail_box SET 	
+			readstatus = #{readstatus},
+			senderid = #{sender.id},
+			receiverid = #{receiver.id},
+			sendtime = #{sendtime},
+			mailid = #{mail.id}
+		WHERE id = #{id}
+	</update>
+	
+	<update id="delete">
+		DELETE FROM iim_mail_box
+		<choose>
+			<when test="id !=null and id != ''">
+				WHERE id = #{id}
+			</when>
+			<otherwise>
+				WHERE mailid = #{mail.id}
+			</otherwise>
+		</choose>
+	</update>
+	
+<!-- 	<update id="deleteByLogic">
+		DELETE FROM iim_mail_box
+		<choose>
+			<when test="id !=null and id != ''">
+				WHERE id = #{id}
+			</when>
+			<otherwise>
+				WHERE mailid = #{mail.id}
+			</otherwise>
+		</choose>
+	</update>-->
+	
+</mapper>

target/classes/com/jeeplus/modules/iim/mapper/xml/MailComposeMapper.xml

@@ -0,0 +1,158 @@
+<?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.jeeplus.modules.iim.mapper.MailComposeMapper">
+    
+	<sql id="mailComposeColumns">
+		a.id AS "id",
+		a.status AS "status",
+		a.readstatus AS "readstatus",
+		a.senderid AS "sender.id",
+		a.receiverid AS "receiver.id",
+		a.sendtime AS "sendtime",
+		a.mailid AS "mail.id",
+		receiver.name AS "receiver.name",
+		receiver.login_name AS "receiver.loginName",
+		mail.title AS "mail.title",
+		mail.overview AS "mail.overview",
+		mail.content AS "mail.content"
+	</sql>
+	
+	<sql id="mailComposeJoins">
+		LEFT JOIN iim_mail mail ON mail.id = a.mailid
+		LEFT JOIN sys_user receiver ON receiver.id = a.receiverid
+	</sql>
+      <resultMap type="MailCompose" id="MailMap" autoMapping="true">
+    	<association property="mail"  javaType="Mail">
+			<id property="id" column="mail.id"/>
+			<result property="title" column="mail.title"/>
+			<result property="overview" column="mail.overview"/>
+			<result property="content" column="mail.content" typeHandler="com.jeeplus.core.mapper.ConvertBlobTypeHandler"/>
+		</association>
+	</resultMap>
+	<select id="get" resultMap="MailMap">
+		SELECT 
+			<include refid="mailComposeColumns"/>
+		FROM iim_mail_compose a
+		<include refid="mailComposeJoins"/>
+		WHERE a.id = #{id}
+	</select>
+	
+	<select id="findList" resultType="MailCompose">
+		SELECT 
+			<include refid="mailComposeColumns"/>
+		FROM iim_mail_compose a
+		<include refid="mailComposeJoins"/>
+		<where>
+			<if test="status != null  and status != ''">
+				AND a.status = #{status}
+			</if>
+			
+			<if test="mail != null and mail.title != null and mail.title != ''">
+				AND ( mail.title like 
+					<if test="dbName == 'oracle'">'%'||#{mail.title}||'%'</if>
+					<if test="dbName == 'mysql'">CONCAT('%', #{mail.title}, '%')</if>
+					or 
+					mail.content like
+					<if test="dbName == 'oracle'">'%'||#{mail.title}||'%'</if>
+					<if test="dbName == 'mysql'">CONCAT('%', #{mail.title}, '%')</if>
+					)
+			</if>
+		</where>
+		<choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+			</otherwise>
+		</choose>
+	</select>
+	
+	<select id="findAllList" resultType="MailCompose">
+		SELECT 
+			<include refid="mailComposeColumns"/>
+		FROM iim_mail_compose a
+		<include refid="mailComposeJoins"/>
+		<where>
+			
+		</where>		
+		<choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+			</otherwise>
+		</choose>
+	</select>
+	
+	<select id="getCount" resultType="java.lang.Integer">
+		SELECT count(*)
+		FROM iim_mail_compose a
+		<include refid="mailComposeJoins"/>
+		<where>
+			<if test="sender != null and sender.id != null and sender.id != ''">
+				AND a.senderid = #{sender.id}
+			</if>
+			
+			<if test="status !=null and status != ''">
+				and a.status = #{status}
+			</if>
+		</where>		
+	
+	</select>
+	
+	<insert id="insert">
+		INSERT INTO iim_mail_compose(
+			id,
+			status,
+			readstatus,
+			senderid,
+			receiverid,
+			sendtime,
+			mailid
+		) VALUES (
+			#{id},
+			#{status},
+			#{readstatus},
+			#{sender.id},
+			#{receiver.id},
+			#{sendtime},
+			#{mail.id}
+		)
+	</insert>
+	
+	<update id="update">
+		UPDATE iim_mail_compose SET 	
+			status = #{status},
+			readstatus = #{readstatus},
+			senderid = #{sender.id},
+			receiverid = #{receiver.id},
+			sendtime = #{sendtime},
+			mailid = #{mail.id}
+		WHERE id = #{id}
+	</update>
+	
+	<update id="delete">
+		DELETE FROM iim_mail_compose
+		<choose>
+			<when test="id !=null and id != ''">
+				WHERE id = #{id}
+			</when>
+			<otherwise>
+				WHERE mailid = #{mail.id}
+			</otherwise>
+		</choose>
+	</update>
+	
+	<!-- <update id="deleteByLogic">
+		DELETE FROM iim_mail_compose
+		<choose>
+			<when test="id !=null and id != ''">
+				WHERE id = #{id}
+			</when>
+			<otherwise>
+				WHERE mailid = #{mail.id}
+			</otherwise>
+		</choose>
+	</update>-->
+	
+</mapper>

target/classes/com/jeeplus/modules/iim/mapper/xml/MailMapper.xml

@@ -0,0 +1,95 @@
+<?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.jeeplus.modules.iim.mapper.MailMapper">
+    
+	<sql id="mailColumns">
+		a.id AS "id",
+		a.title AS "title",
+		a.overview AS "overview",
+		a.content AS "content"
+	</sql>
+	
+	<sql id="mailJoins">
+	</sql>
+    
+	<select id="get" resultType="Mail">
+		SELECT 
+			<include refid="mailColumns"/>
+		FROM iim_mail a
+		<include refid="mailJoins"/>
+		WHERE a.id = #{id}
+	</select>
+	
+	<select id="findList" resultType="Mail">
+		SELECT 
+			<include refid="mailColumns"/>
+		FROM iim_mail a
+		<include refid="mailJoins"/>
+		<where>
+			
+			<if test="title != null and title != ''">
+				AND a.title LIKE 
+					<if test="dbName == 'oracle'">'%'||#{title}||'%'</if>
+					<if test="dbName == 'mssql'">'%'+#{title}+'%'</if>
+					<if test="dbName == 'mysql'">concat('%',#{title},'%')</if>
+			</if>
+		</where>
+		<choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+			</otherwise>
+		</choose>
+	</select>
+	
+	<select id="findAllList" resultType="Mail">
+		SELECT 
+			<include refid="mailColumns"/>
+		FROM iim_mail a
+		<include refid="mailJoins"/>
+		<where>
+			
+		</where>		
+		<choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+			</otherwise>
+		</choose>
+	</select>
+	
+	<insert id="insert">
+		INSERT INTO iim_mail(
+			id,
+			title,
+			overview,
+			content
+		) VALUES (
+			#{id},
+			#{title},
+			#{overview},
+			#{content}
+		)
+	</insert>
+	
+	<update id="update">
+		UPDATE iim_mail SET 	
+			title = #{title},
+			overview = #{overview},
+			content = #{content}
+		WHERE id = #{id}
+	</update>
+	
+	<update id="delete">
+		DELETE FROM iim_mail
+		WHERE id = #{id}
+	</update>
+	
+	<!-- <update id="deleteByLogic">
+		DELETE FROM iim_mail
+		WHERE id = #{id}
+	</update>-->
+	
+</mapper>