diff --git a/attendance-performance-manager-ui/admin/src/views/homeCharts/record/list.vue b/attendance-performance-manager-ui/admin/src/views/homeCharts/record/list.vue
index 992e724c518758ef938b9f7579976947779ee381..91cec163b0f23a7de7faa5b0fd04d007720965f5 100644
--- a/attendance-performance-manager-ui/admin/src/views/homeCharts/record/list.vue
+++ b/attendance-performance-manager-ui/admin/src/views/homeCharts/record/list.vue
@@ -224,100 +224,24 @@ export default {
type: [],
resource: "",
},
- config: {
- data: [
- {
- name: "閮ㄩ棬1",
- value: 95,
- },
- {
- name: "閮ㄩ棬2",
- value: 90,
- },
- {
- name: "閮ㄩ棬3",
- value: 98,
- },
- {
- name: "閮ㄩ棬4",
- value: 91,
- },
- {
- name: "閮ㄩ棬5",
- value: 80,
- },
- {
- name: "閮ㄩ棬6",
- value: 92,
- },
- {
- name: "閮ㄩ棬7",
- value: 93,
- },
- {
- name: "閮ㄩ棬8",
- value: 94,
- },
- {
- name: "閮ㄩ棬9",
- value: 90,
- },
- {
- name: "閮ㄩ棬10",
- value: 100,
- },
- ],
- },
- personConfig: {
- data: [
- {
- name: "涓汉1",
- value: 95,
- },
- {
- name: "涓汉2",
- value: 90,
- },
- {
- name: "涓汉3",
- value: 98,
- },
- {
- name: "涓汉4",
- value: 91,
- },
- {
- name: "涓汉5",
- value: 80,
- },
- {
- name: "涓汉6",
- value: 92,
- },
- {
- name: "涓汉7",
- value: 93,
- },
- {
- name: "涓汉8",
- value: 94,
- },
- {
- name: "涓汉9",
- value: 90,
- },
- {
- name: "涓汉10",
- value: 100,
- },
- ],
- },
+ config: {},//閮ㄩ棬缁╂晥鎬诲垎top10
+ personConfig: {},//涓汉缁╂晥鎬诲垎top10
cricleData: [
{ value: 756, name: "鑰冨嫟缁╂晥" },
{ value: 690, name: "璇勪环缁╂晥" },
{ value: 559, name: "鍔炰欢缁╂晥" },
{ value: 1278, name: "鏁堣兘缁╂晥" },
],
+ // 涓汉缁╂晥鎬诲垎鎺掑悕
+ staffQuery:{
+ page:1,
+ size:10,
+ },
+ // 閮ㄩ棬
+ depQuery:{
+ page:1,
+ size:10,
+ },
};
},
@@ -326,9 +250,48 @@ export default {
this.drawRulePie();
this.drawCorePie();
this.drawRecordPie();
+
+ this.staffStatList()
+ this.depStatList()
},
methods: {
+ // 涓汉缁╂晥鎬诲垎鎺掑悕
+ staffStatList(){
+ this.$post("/staff/perform/stat/list", this.staffQuery).then((res) => {
+ const {code,data} = res
+ if(code == 1){
+ const row = data.data || []
+ const depArr = []
+ row.forEach(element => {
+ depArr.push({
+ name:element.staffName,
+ value:element.totalScore
+ })
+ });
+ this.personConfig = {data:depArr}
+ console.log(row,"涓汉")
+ }
+ });
+ },
+ // 閮ㄩ棬缁╂晥鎬诲垎鎺掑悕
+ depStatList(){
+ this.$post("/dept/perform/stat/list", this.depQuery).then((res) => {
+ const {code,data} = res
+ if(code == 1){
+ const row = data.data || []
+ const depArr = []
+ row.forEach(element => {
+ depArr.push({
+ name:element.deptName,
+ value:element.totalScore
+ })
+ });
+ this.config = {data:depArr}
+ // console.log(row,depArr,"閮ㄩ棬")
+ }
+ });
+ },
drawLeiDa() {
// 鍩轰簬dom锛屽垵濮嬪寲echarts瀹炰緥
let myChart = this.$echarts.init(document.getElementById("leida"));
diff --git a/attendance-performance-manager-ui/admin/src/views/perform/staff/conf/deptdrawershow.vue b/attendance-performance-manager-ui/admin/src/views/perform/staff/conf/deptdrawershow.vue
index fb292c56cbe51a7ab269ea503ea75865f92cb7bc..f74f8d44239d6125cace5ec698f60d54464ea894 100644
--- a/attendance-performance-manager-ui/admin/src/views/perform/staff/conf/deptdrawershow.vue
+++ b/attendance-performance-manager-ui/admin/src/views/perform/staff/conf/deptdrawershow.vue
@@ -367,9 +367,9 @@ export default {
width: 100,
formatter: (row) => {
if (row.check) {
- return <span>涓嶉€夋嫨</span>;
+ return <span style="cursor:pointer;color:#ff0000">涓嶉€夋嫨</span>;
} else {
- return <span style="cursor:pointer">閫夋嫨</span>;
+ return <span style="cursor:pointer;color:#1890ff">閫夋嫨</span>;
}
},
},
diff --git a/attendance-performance-manager-ui/admin/src/views/perform/staff/conf/drawershow.vue b/attendance-performance-manager-ui/admin/src/views/perform/staff/conf/drawershow.vue
index de378f33208296d4ca9c1f6e340615223a442daf..100ade2bdb64c5bc8d733137294d72324a9b0f96 100644
--- a/attendance-performance-manager-ui/admin/src/views/perform/staff/conf/drawershow.vue
+++ b/attendance-performance-manager-ui/admin/src/views/perform/staff/conf/drawershow.vue
@@ -407,9 +407,9 @@ export default {
width: 100,
formatter: (row) => {
if (row.check) {
- return <span>涓嶉€夋嫨</span>;
+ return <span style="cursor:pointer;color:#ff0000">涓嶉€夋嫨</span>;
} else {
- return <span style="cursor:pointer">閫夋嫨</span>;
+ return <span style="cursor:pointer;color:#1890ff">閫夋嫨</span>;
}
},
},
diff --git a/attendance-performance-manager-ui/admin/src/views/perform/staff/conf/list.vue b/attendance-performance-manager-ui/admin/src/views/perform/staff/conf/list.vue
index a2175c375fe87e52d6213d74a4a5aa8704e53fca..90f2ceb57a08d9f66c953952c98ea640e5dc23ef 100644
--- a/attendance-performance-manager-ui/admin/src/views/perform/staff/conf/list.vue
+++ b/attendance-performance-manager-ui/admin/src/views/perform/staff/conf/list.vue
@@ -12,7 +12,7 @@
+ {{ type == 1 ? "鏂板鑰冩牳閮ㄩ棬" : "鏂板鑰冩牳涓汉" }}</el-button
>
</div>
- <div class="mid_content">
+ <div class="mid_content" style="height: auto;">
<div class="goal_box" v-for="(val, i) in dataList" :key="i">
<div class="goal_title">
<img src="../../../../assets/images/u17641.svg" alt="" />
@@ -321,7 +321,7 @@ export default {
box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.117647058823529);
-moz-box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.117647058823529);
-webkit-box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.117647058823529);
- margin: 0 20px 20px 0;
+ margin: 10px 20px 10px 20px;
padding: 20px;
.goal_title {
width: 100%;
diff --git a/attendance-performance-manager-ui/admin/src/views/perform/staff/conf/windowdrawershow.vue b/attendance-performance-manager-ui/admin/src/views/perform/staff/conf/windowdrawershow.vue
index d13964839e80dee24bdf74e0df93bd386288cca2..237f45d0fb372abc613cbd12c8bebbd7dd1bf5a7 100644
--- a/attendance-performance-manager-ui/admin/src/views/perform/staff/conf/windowdrawershow.vue
+++ b/attendance-performance-manager-ui/admin/src/views/perform/staff/conf/windowdrawershow.vue
@@ -193,9 +193,9 @@ export default {
width: 100,
formatter: (row) => {
if (row.check) {
- return <span>涓嶉€夋嫨</span>;
+ return <span style="cursor:pointer;color:#ff0000">涓嶉€夋嫨</span>;
} else {
- return <span style="cursor:pointer">閫夋嫨</span>;
+ return <span style="cursor:pointer;color:#1890ff">閫夋嫨</span>;
}
},
},
diff --git a/attendance-performance-manager-ui/admin/src/views/staff/perform/stat/list.vue b/attendance-performance-manager-ui/admin/src/views/staff/perform/stat/list.vue
index 54802614d101a8b2e94fff2912b4a9e8e86b4e60..d8bca86d9877b4c4e9dbc05b175d592056be8e3a 100644
--- a/attendance-performance-manager-ui/admin/src/views/staff/perform/stat/list.vue
+++ b/attendance-performance-manager-ui/admin/src/views/staff/perform/stat/list.vue
@@ -224,7 +224,7 @@ export default {
const x = []
const y = []
row.forEach(element => {
- x.push(element.deptName)
+ x.push(element.staffName)
y.push(element.totalScore)
});
this.depStatObj.totalScore.x = x
@@ -241,13 +241,30 @@ export default {
const x = []
const y = []
row.forEach(element => {
- x.push(element.deptName)
+ x.push(element.staffName)
y.push(element.attendScoreAdd)
});
this.depStatObj.attendScoreAdd.x = x
this.depStatObj.attendScoreAdd.y = y
}
});
+ // 鍑忓垎
+ const top10Sub = {...this.boardQuery,size:10,orderColList:[{colName:'totalSubScore',sortKind:'desc'}]}
+ this.$post("/staff/perform/stat/list", top10Sub).then((res) => {
+ const {code,data,dict} = res
+ if(code == 1){
+ const row = data.data || []
+ // this.statArr = row
+ const x = []
+ const y = []
+ row.forEach(element => {
+ x.push(element.staffName)
+ y.push(element.totalSubScore)
+ });
+ this.depStatObj.totalSubScore.x = x
+ this.depStatObj.totalSubScore.y = y
+ }
+ });
},
// 閮ㄩ棬缁╂晥鍒嗘暟缁熻
statList(){
@@ -274,7 +291,7 @@ export default {
});
// 鍔犲垎top10
const top10 = {...this.boardQuery,size:10,orderColList:[{colName:'totalAddScore',sortKind:'desc'}]}
- this.$post("/staff/perform/stat/list", top10).then((res) => {
+ this.$post("/dept/perform/stat/list", top10).then((res) => {
const {code,data,dict} = res
if(code == 1){
const row = data.data || []
@@ -292,7 +309,7 @@ export default {
});
// 鍑忓垎
const top10Sub = {...this.boardQuery,size:10,orderColList:[{colName:'totalSubScore',sortKind:'desc'}]}
- this.$post("/staff/perform/stat/list", top10Sub).then((res) => {
+ this.$post("/dept/perform/stat/list", top10Sub).then((res) => {
const {code,data,dict} = res
if(code == 1){
const row = data.data || []
@@ -334,7 +351,7 @@ export default {
const x = []
const y = []
row.forEach(element => {
- x.push(element.deptName)
+ x.push(element.staffName)
y.push(element[this.value])
});
this.depStatObj.alignment.x = x
diff --git a/attendance-performance-manager-ui/admin/src/views/staff/perform/summary/dialogshow.vue b/attendance-performance-manager-ui/admin/src/views/staff/perform/summary/dialogshow.vue
index 46364778c994e06c257966f6ee79f30cabb18954..f874b97f4f7dd205b1834437f02f0c0222a65740 100644
--- a/attendance-performance-manager-ui/admin/src/views/staff/perform/summary/dialogshow.vue
+++ b/attendance-performance-manager-ui/admin/src/views/staff/perform/summary/dialogshow.vue
@@ -1,27 +1,59 @@
<template>
<!-- 寮瑰嚭妗嗚〃鍗� -->
- <el-dialog :title="title" :visible.sync="open" width="90%" append-to-body>
- <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+ <el-dialog :title="title" :visible.sync="open" width="50%" append-to-body>
+ <div class="userName">
+ <div class="user-left">
+ <div class="user-name">
+ {{ form.staffName }}
+ </div>
+ <div class="user-info">
+ <span class="user-i">宸ュ彿锛歿{ form.workNum }}</span>
+ <span class="user-i">鎵€灞為儴闂細{{ form.deptName }}</span>
+ </div>
+ </div>
+ <div class="user-right">
+ <div class="n">{{form.totalScore}}</div>
+ <div class="m">{{ form.month }}鏈堝緱鍒�</div>
+ </div>
+ </div>
+ <div class="userName user-t-item " :class="{t2:item.subAddType == 1,t1:item.subAddType == 2}" v-for="(item) in list" :key="item.id">
+ <div class="user-left">
+ <div class="user-name">
+ {{dictVal('checkType',item.checkType)}}
+ </div>
+ <div class="user-info">
+ <span class="user-i">缁╂晥瑙勫垯锛歿{item.ruleName}}</span>
+ </div>
+ <div class="user-info">
+ <span class="user-i">鏍告煡鏃堕棿锛歿{momentVal(item.checkTime)}}</span>
+ </div>
+ </div>
+ <div class="user-right">
+ <div class="n">{{item.subAddType==1?'+':'-'}}{{item.score}}</div>
+ </div>
+ </div>
+ <!-- <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row>
- <Field label="浜哄憳id" prop="staffId" v-model="form.staffId" placeholder="璇疯緭鍏ヤ汉鍛榠d"/>
- <Field label="宸ュ彿" prop="workNum" v-model="form.workNum" placeholder="璇疯緭鍏ュ伐鍙�"/>
- <Field label="浜哄憳鍚嶇О" prop="staffName" v-model="form.staffName" type="textarea" placeholder="璇疯緭鍏ヤ汉鍛樺悕绉�"/>
- <Field label="閮ㄩ棬id鍙�" prop="deptId" v-model="form.deptId" placeholder="璇疯緭鍏ラ儴闂╥d鍙�"/>
- <Field label="閮ㄩ棬鍚嶇О" prop="deptName" v-model="form.deptName" placeholder="璇疯緭鍏ラ儴闂ㄥ悕绉�"/>
- <Field label="鑰冨嫟缁╂晥鎸囨爣鍒嗘暟" prop="attendScore" v-model="form.attendScore" placeholder="璇疯緭鍏ヨ€冨嫟缁╂晥鎸囨爣鍒嗘暟"/>
- <Field label="璇勪环缁╂晥鎸囨爣鍒嗘暟" prop="assessScore" v-model="form.assessScore" placeholder="璇疯緭鍏ヨ瘎浠风哗鏁堟寚鏍囧垎鏁�"/>
- <Field label="鍔炰欢缁╂晥鍒嗘暟" prop="workScore" v-model="form.workScore" placeholder="璇疯緭鍏ュ姙浠剁哗鏁堝垎鏁�"/>
- <Field label="鏁堣兘缁╂晥鍒嗘暟" prop="effectScore" v-model="form.effectScore" placeholder="璇疯緭鍏ユ晥鑳界哗鏁堝垎鏁�"/>
- <Field label="鍏跺畠缁╂晥鍒嗘暟" prop="otherScore" v-model="form.otherScore" placeholder="璇疯緭鍏ュ叾瀹冪哗鏁堝垎鏁�"/>
- <Field label="绱寮傚父鍒嗘暟" prop="errorScore" v-model="form.errorScore" placeholder="璇疯緭鍏ョ疮璁″紓甯稿垎鏁�"/>
- <Field label="褰撴湀寰楀垎鏁�" prop="totalScore" v-model="form.totalScore" placeholder="璇疯緭鍏ュ綋鏈堝緱鍒嗘暟"/>
- <Field label="澶囨敞" prop="remark" v-model="form.remark" type="textarea" placeholder="璇疯緭鍏ュ娉�"/>
- <Field label="骞�" prop="year" v-model="form.year" placeholder="璇疯緭鍏ュ勾"/>
- <Field label="鏈�" prop="month" v-model="form.month" type="select" :enumData="dict.month" placeholder="璇烽€夋嫨鏈�"/>
+ <Field label="浜哄憳id" prop="staffId" v-model="form.staffId" placeholder="璇疯緭鍏ヤ汉鍛榠d" />
+ <Field label="宸ュ彿" prop="workNum" v-model="form.workNum" placeholder="璇疯緭鍏ュ伐鍙�" />
+ <Field label="浜哄憳鍚嶇О" prop="staffName" v-model="form.staffName" type="textarea" placeholder="璇疯緭鍏ヤ汉鍛樺悕绉�" />
+ <Field label="閮ㄩ棬id鍙�" prop="deptId" v-model="form.deptId" placeholder="璇疯緭鍏ラ儴闂╥d鍙�" />
+ <Field label="閮ㄩ棬鍚嶇О" prop="deptName" v-model="form.deptName" placeholder="璇疯緭鍏ラ儴闂ㄥ悕绉�" />
+ <Field label="鑰冨嫟缁╂晥鎸囨爣鍒嗘暟" prop="attendScore" v-model="form.attendScore" placeholder="璇疯緭鍏ヨ€冨嫟缁╂晥鎸囨爣鍒嗘暟" />
+ <Field label="璇勪环缁╂晥鎸囨爣鍒嗘暟" prop="assessScore" v-model="form.assessScore" placeholder="璇疯緭鍏ヨ瘎浠风哗鏁堟寚鏍囧垎鏁�" />
+ <Field label="鍔炰欢缁╂晥鍒嗘暟" prop="workScore" v-model="form.workScore" placeholder="璇疯緭鍏ュ姙浠剁哗鏁堝垎鏁�" />
+ <Field label="鏁堣兘缁╂晥鍒嗘暟" prop="effectScore" v-model="form.effectScore" placeholder="璇疯緭鍏ユ晥鑳界哗鏁堝垎鏁�" />
+ <Field label="鍏跺畠缁╂晥鍒嗘暟" prop="otherScore" v-model="form.otherScore" placeholder="璇疯緭鍏ュ叾瀹冪哗鏁堝垎鏁�" />
+ <Field label="绱寮傚父鍒嗘暟" prop="errorScore" v-model="form.errorScore" placeholder="璇疯緭鍏ョ疮璁″紓甯稿垎鏁�" />
+ <Field label="褰撴湀寰楀垎鏁�" prop="totalScore" v-model="form.totalScore" placeholder="璇疯緭鍏ュ綋鏈堝緱鍒嗘暟" />
+ <Field label="澶囨敞" prop="remark" v-model="form.remark" type="textarea" placeholder="璇疯緭鍏ュ娉�" />
+ <Field label="骞�" prop="year" v-model="form.year" placeholder="璇疯緭鍏ュ勾" />
+ <Field label="鏈�" prop="month" v-model="form.month" type="select" :enumData="dict.month"
+ placeholder="璇烽€夋嫨鏈�" />
</el-row>
- </el-form>
+ </el-form> -->
<div slot="footer" class="dialog-footer">
<el-button type="primary" v-if="pageInfo.type !== 'view'" @click="submitForm">纭� 瀹�</el-button>
<el-button @click="cancel">鍙� 娑�</el-button>
@@ -30,103 +62,190 @@
</template>
<script>
- import form from "@/assets/mixins/formdialog";
- import dialogShow from "./dialogshow";
- export default {
- mixins: [form],
- components: {
- dialogShow ,
- },
- data() {
- return {
- // 閬僵灞�
- loading: true,
- // 寮瑰嚭灞傛爣棰�
- title: "鍛樺伐缁╂晥缁熻",
- // 鏄惁鏄剧ず寮瑰嚭灞�
- open: false,
- toString:[
- "month",
+import form from "@/assets/mixins/formdialog";
+import dialogShow from "./dialogshow";
+import moment from "moment";
+export default {
+ mixins: [form],
+ components: {
+ dialogShow,
+ },
+ data() {
+ return {
+ // 閬僵灞�
+ loading: true,
+ // 寮瑰嚭灞傛爣棰�
+ title: "鍛樺伐缁╂晥缁熻",
+ // 鏄惁鏄剧ず寮瑰嚭灞�
+ open: false,
+ toString: [
+ "month",
+ ],
+ // 琛ㄥ崟鏍￠獙
+ rules: {
+ year: [
+ { required: true, message: "璇疯緭鍏ュ勾", trigger: "blur" },
],
- // 琛ㄥ崟鏍￠獙
- rules: {
- year: [
- {required: true,message: "璇疯緭鍏ュ勾", trigger: "blur" },
- ],
- month: [
- {required: true,message: "璇疯緭鍏ユ湀", trigger: "blur" },
- ],
+ month: [
+ { required: true, message: "璇疯緭鍏ユ湀", trigger: "blur" },
+ ],
+ },
+ list:[],
+ dict:{}
+ };
+ },
+
+ methods: {
+ // 鏃ユ湡
+ momentVal(v){
+ return moment(v).format('YYYY-MM-DD HH:SS')
+ },
+ // 瀛楀吀杞崲
+ dictVal(key,val){
+ return this.dict[key][val]
+ },
+ /** 鏌ョ湅姹囨€� */
+ checkAll(id) {
+ this.$post("/check/all/record/list", {checkStatus:2,staffId:id}).then((res) => {
+ const { code, data, dict } = res
+ if (code == 1) {
+ const row = data.data || []
+ //deductTime鐢宠瘔鏃堕棿 checkTime 鏍告煡鏃堕棿 ruleName瑙勫垯checkType瀛楀吀 subAddType锛�1澧炲姞2鍑弒core
+ this.list = row
+ this.dict = dict
+ console.log(row,dict,"22222222222")
}
- };
+ });
+ },
+ /** 缂栬緫 */
+ edit(row) {
+ this.reset()
+ this.query = { id: row.id };
+ this.urls.currUrl = "staff/perform/summary/edit";
+ this.getData();
+ this.pageInfo.type = "edit"
+ this.title = "淇敼鍛樺伐缁╂晥缁熻";
+ },
+ /** 鏂板 */
+ add(row) {
+ this.reset()
+ this.urls.currUrl = "staff/perform/summary/add";
+ this.getData();
+ this.pageInfo.type = "add"
+ this.title = "鏂板鍛樺伐缁╂晥缁熻";
+ },
+ /** 鏌ョ湅*/
+ view(row) {
+ this.reset()
+ this.query = { id: row.id };
+ this.urls.currUrl = "staff/perform/summary/view";
+ this.getData();
+ this.pageInfo.type = "view"
+ this.title = "鍛樺伐缁╂晥缁熻璇︾粏";
+ this.checkAll(row.staffId)
+ },
+ /**鍙栨秷鎸夐挳 */
+ cancel() {
+ this.open = false;
+ },
+ /**鑾峰彇鏁版嵁鍚庡脊妗� */
+ afterRender(data) {
+ this.open = true;
},
- methods: {
- /** 缂栬緫 */
- edit(row) {
- this.reset()
- this.query = { id: row.id };
- this.urls.currUrl ="staff/perform/summary/edit";
- this.getData();
- this.pageInfo.type="edit"
- this.title = "淇敼鍛樺伐缁╂晥缁熻";
- },
- /** 鏂板 */
- add(row) {
- this.reset()
- this.urls.currUrl = "staff/perform/summary/add";
- this.getData();
- this.pageInfo.type="add"
- this.title = "鏂板鍛樺伐缁╂晥缁熻";
- },
- /** 鏌ョ湅*/
- view(row) {
- this.reset()
- this.query = { id: row.id };
- this.urls.currUrl ="staff/perform/summary/view";
- this.getData();
- this.pageInfo.type="view"
- this.title = "鍛樺伐缁╂晥缁熻璇︾粏";
- },
- /**鍙栨秷鎸夐挳 */
- cancel() {
- this.open = false;
- },
- /**鑾峰彇鏁版嵁鍚庡脊妗� */
- afterRender(data) {
- this.open = true;
- },
-
- afterSubmit(data) {
- this.open = false;
- this.$emit("ok");
- },
+ afterSubmit(data) {
+ this.open = false;
+ this.$emit("ok");
+ },
- // 琛ㄥ崟閲嶇疆
- reset() {
- this.form = {
- staffId : 0,
- workNum : "",
- staffName : "",
- deptId : 0,
- deptName : "",
- attendScore : null,
- assessScore : null,
- workScore : null,
- effectScore : null,
- otherScore : null,
- errorScore : null,
- totalScore : null,
- remark : "",
- year : null,
- month : null,
- };
- this.resetForm("form");
- },
- resetForm(refName) {
- if (this.$refs[refName]) {
- this.$refs[refName].resetFields();
- }
- },
+ // 琛ㄥ崟閲嶇疆
+ reset() {
+ this.form = {
+ staffId: 0,
+ workNum: "",
+ staffName: "",
+ deptId: 0,
+ deptName: "",
+ attendScore: null,
+ assessScore: null,
+ workScore: null,
+ effectScore: null,
+ otherScore: null,
+ errorScore: null,
+ totalScore: null,
+ remark: "",
+ year: null,
+ month: null,
+ };
+ this.resetForm("form");
+ },
+ resetForm(refName) {
+ if (this.$refs[refName]) {
+ this.$refs[refName].resetFields();
+ }
},
- };
+ },
+};
</script>
+<style lang="less" scoped>
+.userName {
+ background: rgba(242, 246, 252, 1);
+ display: flex;
+ align-items: center;
+ padding: 15px;
+
+ .user-left {
+ flex: 1;
+ }
+
+ .user-name {
+ font-size: 18px;
+ font-weight: bold;
+ }
+
+ .user-info {
+ margin-top: 10px;
+
+ .user-i {
+ margin-right: 40px;
+ }
+ }
+
+ .user-right {
+ text-align: center;
+
+ .n {
+ font-size: 16px;
+ font-weight: bold;
+ }
+
+ .m {
+ font-size: 12px;
+ }
+ }
+}
+
+.user-t-item {
+ margin-top: 20px;
+ border-left: 4px solid #FF4242;
+}
+
+.t1 {
+ border-color: #FF4242;
+ background: rgba(255, 66, 66, 0.07);
+
+ .user-name,
+ .n {
+ color: #FF4242;
+ }
+}
+.t2 {
+ border-color: rgba(27, 198, 167, 1);
+ background: rgba(27, 198, 167, 0.07);
+
+ .user-name,
+ .n {
+ color: rgba(27, 198, 167, 1);
+ }
+}
+</style>
\ No newline at end of file
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/BaseReq.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/BaseReq.java
index 3f972134e7e0252807e7ffdeaa217b8d25ad3b34..4156b8391a771eb44e3da3f59e4130c94198665b 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/BaseReq.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/BaseReq.java
@@ -21,8 +21,6 @@ public abstract class BaseReq implements Serializable {
-
-
/**
* 宸ュ彿
*/
@@ -42,6 +40,9 @@ public abstract class BaseReq implements Serializable {
* 瑙勫垯缂栫爜
*/
private String ruleCode;
+
+ private Long ruleId;
+
private String phone;
@@ -51,4 +52,7 @@ public abstract class BaseReq implements Serializable {
private String performType;
+ private Long staffId;
+
+
}
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/dingtalk/api/TalkApiController.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/dingtalk/api/TalkApiController.java
index 0a94cf7f190d95306c14eef9e9a8e92d451614af..05ef7ba019ebf1409324f4548326a618ebbe3c3a 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/dingtalk/api/TalkApiController.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/dingtalk/api/TalkApiController.java
@@ -13,6 +13,8 @@ import com.mortals.framework.exception.AppException;
import com.mortals.xhx.busiz.dingtalk.config.TalkConfiguration;
import com.mortals.xhx.busiz.dingtalk.req.DingTalkBaseReq;
import com.mortals.xhx.busiz.dingtalk.req.UserPageReq;
+import com.mortals.xhx.busiz.req.CodeReq;
+import com.mortals.xhx.busiz.req.LinkMessageReq;
import com.mortals.xhx.busiz.req.MobileReq;
import com.mortals.xhx.busiz.req.ReviewSaveReq;
import com.mortals.xhx.common.code.YesNoEnum;
@@ -131,9 +133,9 @@ public class TalkApiController {
if(dingToken == null){
dingToken = getToken().getData();
}
- req.setDeptId(res.getDeptid());
- req.setCursor(res.getCursor());
- req.setSize(res.getSize());
+ req.setDeptId(res.getDeptid()); //閮ㄩ棬id
+ req.setCursor(res.getCursor()); //璧峰椤垫父鏍�
+ req.setSize(res.getSize()); //鍒嗛〉鏉℃暟
OapiV2UserListResponse rsp = client.execute(req, dingToken);
if(rsp.getErrcode() == 0){
apiRespPdu.setCode(0);
@@ -173,11 +175,12 @@ public class TalkApiController {
if(dingToken == null){
dingToken = getToken().getData();
}
- req.setMobile(mobile.getMobile());
+ req.setMobile(mobile.getMobile()); //鐢ㄦ埛鎵嬫満鍙�
+ //鍏堟牴鎹墜鏈哄彿鍘昏幏鍙杣serid 鍐嶉€氳繃userid鑾峰彇璇︽儏 閽夐拤娌℃湁鐩存帴鏍规嵁鐢佃瘽鑾峰彇鐢ㄦ埛璇︽儏鐨勬帴鍙�
OapiV2UserGetbymobileResponse rsp = client.execute(req, dingToken);
if(rsp.getErrcode() == 0){
//鏍规嵁鑾峰彇鍒扮殑userid鍘昏幏鍙栫敤鎴疯鎯�
- ApiRespPdu<OapiV2UserGetResponse.UserGetResponse> userRsp = getUserInfo(rsp.getResult().getUserid());
+ ApiRespPdu<OapiV2UserGetResponse.UserGetResponse> userRsp = getUserInfoByUserId(rsp.getResult().getUserid());
if(userRsp.getCode() == 0){
apiRespPdu.setCode(userRsp.getCode());
apiRespPdu.setData(userRsp.getData());
@@ -211,17 +214,17 @@ public class TalkApiController {
* 鏍规嵁userid鏌ヨ鐢ㄦ埛璇︽儏
* @return
*/
- @GetMapping("/dingtalk/getUserInfo")
+ @GetMapping("/dingtalk/getUserInfoByUserId")
@UnAuth
- public ApiRespPdu<OapiV2UserGetResponse.UserGetResponse> getUserInfo(@RequestBody String userid){
+ public ApiRespPdu<OapiV2UserGetResponse.UserGetResponse> getUserInfoByUserId(@RequestBody String userid){
ApiRespPdu<OapiV2UserGetResponse.UserGetResponse> apiRespPdu = new ApiRespPdu<>();
try {
- DingTalkClient client = new DefaultDingTalkClient(talkConfiguration.getGetuserinfo());
+ DingTalkClient client = new DefaultDingTalkClient(talkConfiguration.getGetuserinfobyuserid());
OapiV2UserGetRequest req = new OapiV2UserGetRequest();
if(dingToken == null){
dingToken = getToken().getData();
}
- req.setUserid(userid);
+ req.setUserid(userid); //鐢ㄦ埛id
OapiV2UserGetResponse rsp = client.execute(req, dingToken);
apiRespPdu.setCode(0);
@@ -236,4 +239,85 @@ public class TalkApiController {
return apiRespPdu;
}
+
+
+ /**
+ * 鎺ㄩ€侀摼鎺ョ被閽夐拤宸ヤ綔娑堟伅
+ * @return
+ */
+ @PostMapping("/dingtalk/sendLinkMessage")
+ @UnAuth
+ public ApiRespPdu<String> sendLinkMessage(@RequestBody LinkMessageReq linkMessageReq){
+ ApiRespPdu<String> apiRespPdu = new ApiRespPdu<>();
+ try {
+ DingTalkClient client = new DefaultDingTalkClient(talkConfiguration.getSendmessage());
+ if(dingToken == null){
+ dingToken = getToken().getData();
+ }
+ OapiMessageCorpconversationAsyncsendV2Request req = new OapiMessageCorpconversationAsyncsendV2Request();
+ req.setAgentId(Long.valueOf(talkConfiguration.getGetAgentId()));
+ req.setUseridList(linkMessageReq.getUserIdList());
+
+ OapiMessageCorpconversationAsyncsendV2Request.Msg obj1 = new OapiMessageCorpconversationAsyncsendV2Request.Msg();
+ obj1.setMsgtype("link"); //type涓洪摼鎺ョ被娑堟伅
+ OapiMessageCorpconversationAsyncsendV2Request.Link obj2 = new OapiMessageCorpconversationAsyncsendV2Request.Link();
+ obj2.setPicUrl(linkMessageReq.getPicUrl()); //娑堟伅鍥剧墖鍦板潃
+ obj2.setMessageUrl(linkMessageReq.getMessageUrl()); //璺宠浆閾炬帴鍦板潃
+ obj2.setText(linkMessageReq.getText()); //娑堟伅鎻忚堪
+ obj2.setTitle(linkMessageReq.getTitle()); //娑堟伅title
+ obj1.setLink(obj2);
+ req.setMsg(obj1);
+
+ OapiMessageCorpconversationAsyncsendV2Response rsp = client.execute(req, dingToken);
+ if(rsp.getErrcode() == 0){
+ apiRespPdu.setCode(0);
+ apiRespPdu.setData(rsp.getBody());
+ apiRespPdu.setMsg(rsp.getMsg());
+ }else {
+ apiRespPdu.setCode(-1);
+ apiRespPdu.setData(rsp.getBody());
+ apiRespPdu.setMsg(rsp.getMsg());
+
+ }
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ apiRespPdu.setCode(-1);
+ apiRespPdu.setData("");
+ apiRespPdu.setMsg(e.toString());
+ }
+
+ return apiRespPdu;
+ }
+
+
+ /**
+ * 鏍规嵁鍏嶇櫥鐮佹煡璇㈢敤鎴疯鎯�
+ * @return
+ */
+ @GetMapping("/dingtalk/getUserInfoByCode")
+ @UnAuth
+ public ApiRespPdu<OapiV2UserGetuserinfoResponse.UserGetByCodeResponse> getUserInfoByCode(@RequestBody CodeReq codeReq){
+ ApiRespPdu<OapiV2UserGetuserinfoResponse.UserGetByCodeResponse> apiRespPdu = new ApiRespPdu<>();
+ try {
+ DingTalkClient client = new DefaultDingTalkClient(talkConfiguration.getGetuserinfobycode());
+ OapiV2UserGetuserinfoRequest req = new OapiV2UserGetuserinfoRequest();
+ if(dingToken == null){
+ dingToken = getToken().getData();
+ }
+ req.setCode(codeReq.getCode()); //鍓嶇js鑾峰彇鍒扮殑鍏嶇櫥鐮� 鐢ㄥ厤鐧荤爜鑾峰彇鐢ㄦ埛淇℃伅
+ OapiV2UserGetuserinfoResponse rsp = client.execute(req, dingToken);
+
+ apiRespPdu.setCode(0);
+ apiRespPdu.setData(rsp.getResult());
+ apiRespPdu.setMsg(rsp.getMsg());
+ } catch (Exception e) {
+ e.printStackTrace();
+ apiRespPdu.setCode(-1);
+ apiRespPdu.setData(null);
+ apiRespPdu.setMsg(e.toString());
+ }
+
+ return apiRespPdu;
+ }
}
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/dingtalk/config/TalkConfiguration.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/dingtalk/config/TalkConfiguration.java
index ab4fff7a4f72ad62321cbf3bf13b0d8df040d048..57b7d3a29e6185cc64f7a103c5d34f0792638ee0 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/dingtalk/config/TalkConfiguration.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/dingtalk/config/TalkConfiguration.java
@@ -58,8 +58,21 @@ public class TalkConfiguration {
/**
* 鏍规嵁userid鏌ヨ鐢ㄦ埛淇℃伅
*/
- @Value("${dingtalk.getuserinfo:https://oapi.dingtalk.com/topapi/v2/user/get}")
- private String getuserinfo;
+ @Value("${dingtalk.getuserinfobyuserid:https://oapi.dingtalk.com/topapi/v2/user/get}")
+ private String getuserinfobyuserid;
+
+ /**
+ * 鏍规嵁鍏嶇櫥鐮佹煡璇㈢敤鎴蜂俊鎭�
+ */
+ @Value("${dingtalk.getuserinfobycode:https://oapi.dingtalk.com/topapi/v2/user/getuserinfo}")
+ private String getuserinfobycode;
+
+ /**
+ * 鎺ㄩ€侀拤閽夊伐浣滄秷鎭�
+ */
+ @Value("${dingtalk.sendmessage:https://oapi.dingtalk.com/topapi/message/corpconversation/asyncsend_v2}")
+ private String sendmessage;
+
/**
* getDeptbyUser
*/
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/req/CodeReq.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/req/CodeReq.java
new file mode 100644
index 0000000000000000000000000000000000000000..a71ac19758b3ae9f501890b9869c03ef620bb729
--- /dev/null
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/req/CodeReq.java
@@ -0,0 +1,18 @@
+package com.mortals.xhx.busiz.req;
+
+/**
+ * @author ZYW
+ * @date 2023-07-13 20:11
+ */
+
+public class CodeReq {
+ String code;
+
+ public String getCode() {
+ return code;
+ }
+
+ public void setCode(String code) {
+ this.code = code;
+ }
+}
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/req/InspectSaveReq.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/req/InspectSaveReq.java
index 1dc1e3bdc790f57875a1dd6fab0acc67ecc8743a..6e3c7bcea0c043e52a46c5b704495f3660b1b476 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/req/InspectSaveReq.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/req/InspectSaveReq.java
@@ -9,6 +9,7 @@ import java.util.Date;
@Data
public class InspectSaveReq extends BaseReq {
+ //鑰冨嫟
/**
* 鎵€灞炶€冨嫟缁処D
*/
@@ -42,8 +43,116 @@ public class InspectSaveReq extends BaseReq {
*/
private String errorResult;
+//璇勪环
+ /**
+ * 璇勪环缁撴灉(1.闈炲父涓嶆弧鎰�,2.宸瘎)
+ */
+ private Integer reviewResult;
+ /**
+ * 璇勪环鏃堕棿
+ */
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date reviewTime;
+ /**
+ * 璇勪环鏉ユ簮(绐楀彛璇勪环绯荤粺,瀵艰绯荤粺,鑷姪鏈嶅姟绯荤粺,寰畼缃�,鍏跺畠)
+ */
+ private String reviewSource;
+ /**
+ * 璇勪环璁惧
+ */
+ private String reviewDevice;
+
+ //鎶曡瘔
+
+ /**
+ * 鎶曡瘔鏍囬
+ */
+ private String complainTitle;
+ /**
+ * 鎶曡瘔鍐呭
+ */
+ private String complainContent;
+ /**
+ * 鎶曡瘔浜虹湡瀹炲鍚�
+ */
+ private String complainRealName;
+ /**
+ * 鑱旂郴鐢佃瘽
+ */
+ private String contact;
+ /**
+ * 鎶曡瘔鏃堕棿
+ */
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date complainTime;
+ /**
+ * 鎶曡瘔鏉ユ簮
+ */
+ private String complainSource;
+ /**
+ * 鎶曡瘔璁惧
+ */
+ private String complainDevice;
+
+ //鍔炰欢
+ /**
+ * 鍔炰欢缂栫爜
+ */
+ private String goworkCode;
+ /**
+ * 鍔炰欢鎵€灞為儴闂�
+ */
+ private String goworkDepts;
+ /**
+ * 浜嬮」鍚嶇О
+ */
+ private String matterlName;
+ /**
+ * 鍔炵悊鏃堕棿
+ */
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date goworkTime;
+
+
+ //鏁堣兘
+
+ /**
+ * 杩濊绫诲瀷(1.鑴卞矖,2.绂诲矖,3.鐜╂墜鏈�,4.鐫¤)
+ */
+ private Integer irregularType;
+ /**
+ * 鍙戠敓鏃堕棿
+ */
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date happenTime;
+ /**
+ * 鎸佺画鏃堕棿锛岀
+ */
+ private Integer duration;
+ /**
+ * 鎶ヨ鏃堕棿
+ */
+ private Date alarmTime;
+
+ //鍏跺畠
+
+ /**
+ * 杩濊绫诲瀷(1.宸ヤ綔绾緥)
+ */
+ private Integer irregularOtherType;
+// /**
+// * 鍙戠敓鏃堕棿
+// */
+// @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+// private Date happenTime;
+
+ /**
+ * 璇勫垎鏍囧噯
+ */
+ private String ruleDesc;
+ private Long checkRecordId;
}
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/req/LinkMessageReq.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/req/LinkMessageReq.java
new file mode 100644
index 0000000000000000000000000000000000000000..9864830f656ed5e16e312a00cae38b3377fc28f7
--- /dev/null
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/req/LinkMessageReq.java
@@ -0,0 +1,55 @@
+package com.mortals.xhx.busiz.req;
+
+/**
+ * @author ZYW
+ * @date 2023-07-13 19:30
+ * 杩炴帴绫诲伐浣滄秷鎭�
+ */
+
+public class LinkMessageReq {
+ String userIdList; //鎺ユ敹鑰呯敤鎴穒d鍒楄〃 澶氫釜鎺ユ敹鑰呯敤,闅斿紑
+ String picUrl; //娑堟伅鍥剧墖鍦板潃
+ String messageUrl; //閾炬帴鍦板潃
+ String title; //娑堟伅鏍囬锛屽缓璁�100瀛楃浠ュ唴銆�
+ String text; //娑堟伅鎻忚堪锛屽缓璁�500瀛楃浠ュ唴銆�
+
+ public String getUserIdList() {
+ return userIdList;
+ }
+
+ public void setUserIdList(String userIdList) {
+ this.userIdList = userIdList;
+ }
+
+ public String getPicUrl() {
+ return picUrl;
+ }
+
+ public void setPicUrl(String picUrl) {
+ this.picUrl = picUrl;
+ }
+
+ public String getTitle() {
+ return title;
+ }
+
+ public void setTitle(String title) {
+ this.title = title;
+ }
+
+ public String getText() {
+ return text;
+ }
+
+ public void setText(String text) {
+ this.text = text;
+ }
+
+ public String getMessageUrl() {
+ return messageUrl;
+ }
+
+ public void setMessageUrl(String messageUrl) {
+ this.messageUrl = messageUrl;
+ }
+}
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/req/PerformReq.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/req/PerformReq.java
index 642f165fa34b87c862b346b06f1fe36ab21143b9..954059930aab7eaad16f6613043bb491af6905d7 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/req/PerformReq.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/req/PerformReq.java
@@ -19,5 +19,9 @@ public class PerformReq extends BaseReq {
private Long id;
+ private Integer processStatus;
+
+ private Integer scoreType;
+
}
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/req/ReviewSaveReq.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/req/ReviewSaveReq.java
index e766871161fcb6b2ac4a29fb0c744475ef0147f0..7be64163d947948093c58481ceec7f1ef54bf99a 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/req/ReviewSaveReq.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/req/ReviewSaveReq.java
@@ -18,7 +18,7 @@ public class ReviewSaveReq extends BaseReq {
* 璇勪环鏃堕棿
*/
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
- private Date reviewTime;
+ private String reviewTime;
/**
* 璇勪环鏉ユ簮(绐楀彛璇勪环绯荤粺,瀵艰绯荤粺,鑷姪鏈嶅姟绯荤粺,寰畼缃�,鍏跺畠)
*/
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/rsp/InspectStatInfo.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/rsp/InspectStatInfo.java
new file mode 100644
index 0000000000000000000000000000000000000000..20fdc42c5f493c4bd21ec2ef9417bb26ec314215
--- /dev/null
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/rsp/InspectStatInfo.java
@@ -0,0 +1,21 @@
+package com.mortals.xhx.busiz.rsp;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class InspectStatInfo {
+
+ /**
+ * 绱娆℃暟
+ */
+ private Integer totalTimes;
+
+
+ /**
+ * 浠婃棩娆℃暟
+ */
+ private Integer todayTimes;
+
+}
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/rsp/PerformDetailInfo.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/rsp/PerformDetailInfo.java
index 99ea7fe0d9240c06945f103e2f461ff610cca034..600f324f7c733e91660e6be6f83b9481728501ef 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/rsp/PerformDetailInfo.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/rsp/PerformDetailInfo.java
@@ -217,4 +217,8 @@ public class PerformDetailInfo {
private Integer irregularOtherType;
+ /**
+ * 鐢宠瘔鐘舵€�(0.鏈敵璇�,1.鐢宠瘔涓�,2.鐢宠瘔鎷掔粷,3.鐢宠瘔閫氳繃)
+ */
+ private Integer appealStatus;
}
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/web/ApiWebPerformController.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/web/ApiWebPerformController.java
index c59ed755a22305f3bec996f6c75bf90d9373029a..0840f359c09d8da00ad62831ab0903810ba912bd 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/web/ApiWebPerformController.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/web/ApiWebPerformController.java
@@ -31,7 +31,7 @@ import java.util.Date;
@RestController
@Slf4j
@RequestMapping("/api/v1/web/")
-public class ApiWebPerformController extends AbstractBaseController<PerformReq> {
+public class ApiWebPerformController extends AbstractBaseController<PerformReq> {
@Autowired
private PerformAttendRecordService attendRecordService;
@@ -63,13 +63,11 @@ public class ApiWebPerformController extends AbstractBaseControll
String busiDesc = "澶栭儴鑰冨嫟鏂板";
Rest rest = Rest.ok(busiDesc + "鎴愬姛锛�");
- StringBuilder message = new StringBuilder();
- message.append(String.format("銆愬閮ㄨ姹傘€戠被鍨嬨€�%s銆� 鍐呭:%s", PerformTypeEnum.getByValue(req.getPerformType()).getDesc(), JSONObject.toJSONString(req)));
try {
if (ObjectUtils.isEmpty(req.getPhone())) throw new AppException("鎵嬫満鍙风爜涓嶈兘涓虹┖锛�");
if (ObjectUtils.isEmpty(req.getRuleCode())) throw new AppException("缁╂晥瑙勫垯缂栫爜涓嶈兘涓虹┖锛�");
boolean bool = attend(req);
- if (!bool) throw new AppException(busiDesc + "澶辫触锛�");
+ if (bool) throw new AppException(busiDesc + "澶辫触锛�");
} catch (Exception e) {
log.error(busiDesc, e);
return Rest.fail(e.getMessage());
@@ -90,13 +88,11 @@ public class ApiWebPerformController extends AbstractBaseControll
String busiDesc = "澶栭儴璇勪环鏂板";
Rest rest = Rest.ok(busiDesc + "鎴愬姛锛�");
- StringBuilder message = new StringBuilder();
- message.append(String.format("銆愬閮ㄨ姹傘€戠被鍨嬨€�%s銆� 鍐呭:%s", PerformTypeEnum.getByValue(req.getPerformType()).getDesc(), JSONObject.toJSONString(req)));
try {
if (ObjectUtils.isEmpty(req.getPhone())) throw new AppException("鎵嬫満鍙风爜涓嶈兘涓虹┖锛�");
if (ObjectUtils.isEmpty(req.getRuleCode())) throw new AppException("缁╂晥瑙勫垯缂栫爜涓嶈兘涓虹┖锛�");
boolean bool = review(req);
- if (!bool) throw new AppException(busiDesc + "澶辫触锛�");
+ if (bool) throw new AppException(busiDesc + "澶辫触锛�");
} catch (Exception e) {
log.error(busiDesc, e);
return Rest.fail(e.getMessage());
@@ -117,13 +113,11 @@ public class ApiWebPerformController extends AbstractBaseControll
String busiDesc = "澶栭儴鎶曡瘔鏂板";
Rest rest = Rest.ok(busiDesc + "鎴愬姛锛�");
- StringBuilder message = new StringBuilder();
- message.append(String.format("銆愬閮ㄨ姹傘€戠被鍨嬨€�%s銆� 鍐呭:%s", PerformTypeEnum.getByValue(req.getPerformType()).getDesc(), JSONObject.toJSONString(req)));
try {
if (ObjectUtils.isEmpty(req.getPhone())) throw new AppException("鎵嬫満鍙风爜涓嶈兘涓虹┖锛�");
if (ObjectUtils.isEmpty(req.getRuleCode())) throw new AppException("缁╂晥瑙勫垯缂栫爜涓嶈兘涓虹┖锛�");
boolean bool = complain(req);
- if (!bool) throw new AppException(busiDesc + "澶辫触锛�");
+ if (bool) throw new AppException(busiDesc + "澶辫触锛�");
} catch (Exception e) {
log.error(busiDesc, e);
return Rest.fail(e.getMessage());
@@ -144,13 +138,11 @@ public class ApiWebPerformController extends AbstractBaseControll
String busiDesc = "澶栭儴鍔炰欢鏂板";
Rest rest = Rest.ok(busiDesc + "鎴愬姛锛�");
- StringBuilder message = new StringBuilder();
- message.append(String.format("銆愬閮ㄨ姹傘€戠被鍨嬨€�%s銆� 鍐呭:%s", PerformTypeEnum.getByValue(req.getPerformType()).getDesc(), JSONObject.toJSONString(req)));
try {
if (ObjectUtils.isEmpty(req.getPhone())) throw new AppException("鎵嬫満鍙风爜涓嶈兘涓虹┖锛�");
if (ObjectUtils.isEmpty(req.getRuleCode())) throw new AppException("缁╂晥瑙勫垯缂栫爜涓嶈兘涓虹┖锛�");
boolean bool = gowork(req);
- if (!bool) throw new AppException(busiDesc + "澶辫触锛�");
+ if (bool) throw new AppException(busiDesc + "澶辫触锛�");
} catch (Exception e) {
log.error(busiDesc, e);
return Rest.fail(e.getMessage());
@@ -171,13 +163,11 @@ public class ApiWebPerformController extends AbstractBaseControll
String busiDesc = "澶栭儴鏁堣兘鏂板";
Rest rest = Rest.ok(busiDesc + "鎴愬姛锛�");
- StringBuilder message = new StringBuilder();
- message.append(String.format("銆愬閮ㄨ姹傘€戠被鍨嬨€�%s銆� 鍐呭:%s", PerformTypeEnum.getByValue(req.getPerformType()).getDesc(), JSONObject.toJSONString(req)));
try {
if (ObjectUtils.isEmpty(req.getPhone())) throw new AppException("鎵嬫満鍙风爜涓嶈兘涓虹┖锛�");
if (ObjectUtils.isEmpty(req.getRuleCode())) throw new AppException("缁╂晥瑙勫垯缂栫爜涓嶈兘涓虹┖锛�");
boolean bool = effect(req);
- if (!bool) throw new AppException(busiDesc + "澶辫触锛�");
+ if (bool) throw new AppException(busiDesc + "澶辫触锛�");
} catch (Exception e) {
log.error(busiDesc, e);
return Rest.fail(e.getMessage());
@@ -198,13 +188,11 @@ public class ApiWebPerformController extends AbstractBaseControll
String busiDesc = "澶栭儴鍏跺畠缁╂晥鏂板";
Rest rest = Rest.ok(busiDesc + "鎴愬姛锛�");
- StringBuilder message = new StringBuilder();
- message.append(String.format("銆愬閮ㄨ姹傘€戠被鍨嬨€�%s銆� 鍐呭:%s", PerformTypeEnum.getByValue(req.getPerformType()).getDesc(), JSONObject.toJSONString(req)));
try {
if (ObjectUtils.isEmpty(req.getPhone())) throw new AppException("鎵嬫満鍙风爜涓嶈兘涓虹┖锛�");
if (ObjectUtils.isEmpty(req.getRuleCode())) throw new AppException("缁╂晥瑙勫垯缂栫爜涓嶈兘涓虹┖锛�");
boolean bool = other(req);
- if (!bool) throw new AppException(busiDesc + "澶辫触锛�");
+ if (bool) throw new AppException(busiDesc + "澶辫触锛�");
} catch (Exception e) {
log.error(busiDesc, e);
return Rest.fail(e.getMessage());
@@ -225,7 +213,8 @@ public class ApiWebPerformController extends AbstractBaseControll
BeanUtils.copyProperties(req, recordEntity);
recordEntity.setStaffId(staffEntity.getId());
recordEntity.setStaffName(staffEntity.getName());
-
+ recordEntity.setDeptId(staffEntity.getDeptId());
+ recordEntity.setDeptName(staffEntity.getDeptName());
recordEntity.setSubAddType(rule.getSubAddType());
recordEntity.setScore(rule.getScore());
@@ -233,7 +222,8 @@ public class ApiWebPerformController extends AbstractBaseControll
recordEntity.setRuleNme(rule.getName());
recordEntity.setCategoryId(rule.getCategoryId());
recordEntity.setCategoryName(rule.getCategoryName());
-
+ recordEntity.setDeductPerson("admin");
+ recordEntity.setDeductTime(new Date());
recordEntity.setCreateUserId(1L);
recordEntity.setCreateTime(new Date());
PerformAttendRecordEntity save = attendRecordService.save(recordEntity);
@@ -254,13 +244,16 @@ public class ApiWebPerformController extends AbstractBaseControll
BeanUtils.copyProperties(req, recordEntity);
recordEntity.setStaffId(staffEntity.getId());
recordEntity.setStaffName(staffEntity.getName());
+ recordEntity.setDeptId(staffEntity.getDeptId());
+ recordEntity.setDeptName(staffEntity.getDeptName());
recordEntity.setSubAddType(rule.getSubAddType());
recordEntity.setScore(rule.getScore());
recordEntity.setRuleId(rule.getId());
recordEntity.setRuleName(rule.getName());
recordEntity.setCategoryId(rule.getCategoryId());
recordEntity.setCategoryName(rule.getCategoryName());
-
+ recordEntity.setDeductPerson("admin");
+ recordEntity.setDeductTime(new Date());
recordEntity.setCreateUserId(1L);
recordEntity.setCreateTime(new Date());
PerformReviewRecordEntity save = reviewRecordService.save(recordEntity);
@@ -279,12 +272,16 @@ public class ApiWebPerformController extends AbstractBaseControll
BeanUtils.copyProperties(req, recordEntity);
recordEntity.setStaffId(staffEntity.getId());
recordEntity.setStaffName(staffEntity.getName());
+ recordEntity.setDeptId(staffEntity.getDeptId());
+ recordEntity.setDeptName(staffEntity.getDeptName());
recordEntity.setSubAddType(rule.getSubAddType());
recordEntity.setScore(rule.getScore());
recordEntity.setRuleId(rule.getId());
recordEntity.setRuleName(rule.getName());
recordEntity.setCategoryId(rule.getCategoryId());
recordEntity.setCategoryName(rule.getCategoryName());
+ recordEntity.setDeductPerson("admin");
+ recordEntity.setDeductTime(new Date());
recordEntity.setCreateUserId(1L);
recordEntity.setCreateTime(new Date());
@@ -304,12 +301,16 @@ public class ApiWebPerformController extends AbstractBaseControll
BeanUtils.copyProperties(req, recordEntity);
recordEntity.setStaffId(staffEntity.getId());
recordEntity.setStaffName(staffEntity.getName());
+ recordEntity.setDeptId(staffEntity.getDeptId());
+ recordEntity.setDeptName(staffEntity.getDeptName());
recordEntity.setSubAddType(rule.getSubAddType());
recordEntity.setScore(rule.getScore());
recordEntity.setRuleId(rule.getId());
recordEntity.setRuleName(rule.getName());
recordEntity.setCategoryId(rule.getCategoryId());
recordEntity.setCategoryName(rule.getCategoryName());
+ recordEntity.setDeductPerson("admin");
+ recordEntity.setDeductTime(new Date());
recordEntity.setCreateUserId(1L);
recordEntity.setCreateTime(new Date());
@@ -329,12 +330,16 @@ public class ApiWebPerformController extends AbstractBaseControll
BeanUtils.copyProperties(req, recordEntity);
recordEntity.setStaffId(staffEntity.getId());
recordEntity.setStaffName(staffEntity.getName());
+ recordEntity.setDeptId(staffEntity.getDeptId());
+ recordEntity.setDeptName(staffEntity.getDeptName());
recordEntity.setSubAddType(rule.getSubAddType());
recordEntity.setScore(rule.getScore());
recordEntity.setRuleId(rule.getId());
recordEntity.setRuleName(rule.getName());
recordEntity.setCategoryId(rule.getCategoryId());
recordEntity.setCategoryName(rule.getCategoryName());
+ recordEntity.setDeductPerson("admin");
+ recordEntity.setDeductTime(new Date());
recordEntity.setCreateUserId(1L);
recordEntity.setCreateTime(new Date());
@@ -354,6 +359,8 @@ public class ApiWebPerformController extends AbstractBaseControll
BeanUtils.copyProperties(req, recordEntity);
recordEntity.setStaffId(staffEntity.getId());
recordEntity.setStaffName(staffEntity.getName());
+ recordEntity.setDeptId(staffEntity.getDeptId());
+ recordEntity.setDeptName(staffEntity.getDeptName());
recordEntity.setSubAddType(rule.getSubAddType());
recordEntity.setScore(rule.getScore());
recordEntity.setRuleId(rule.getId());
@@ -361,6 +368,9 @@ public class ApiWebPerformController extends AbstractBaseControll
recordEntity.setCategoryId(rule.getCategoryId());
recordEntity.setCategoryName(rule.getCategoryName());
+ recordEntity.setDeductPerson("admin");
+ recordEntity.setDeductTime(new Date());
+
recordEntity.setCreateUserId(1L);
recordEntity.setCreateTime(new Date());
PerformOtherRecordEntity save = otherRecordService.save(recordEntity);
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/web/AppealApiController.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/web/AppealApiController.java
index 11668209fe547f561d5fd771513368a0b4be4dd7..e121b62a9be3560a5fed781dbb28010495729a1e 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/web/AppealApiController.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/web/AppealApiController.java
@@ -176,6 +176,9 @@ public class AppealApiController extends AbstractBaseController<PerformReq> {
Rest<PerformAttendAppealEntity> rest = Rest.ok(busiDesc + " 銆愭垚鍔熴€�");
Context context = this.getContext();
try {
+ if (ObjectUtils.isEmpty(context) || ObjectUtils.isEmpty(context.getUser())) {
+ throw new AppException(ERROR_TOKEN_EXPIRED, ERROR_TOKEN_EXPIRED_CONTENT);
+ }
//鏍规嵁鐘舵€� 鏌ヨ 褰撳墠鏄惁宸茬粡瀛樺湪姝ｅ湪杩涜鐨勭敵璇�
if (ObjectUtils.isEmpty(req.getId())) throw new AppException("鏍告煡璁板綍Id涓嶈兘涓虹┖锛�");
if (ObjectUtils.isEmpty(req.getPerformType())) throw new AppException("缁╂晥绫诲瀷涓嶈兘涓虹┖锛�");
@@ -218,6 +221,9 @@ public class AppealApiController extends AbstractBaseController<PerformReq> {
entity.setPerformAttendAppealFilesList(req.getPerformAttendAppealFilesList());
entity.setProcessStatus(1);
entity.setAppealDesc(req.getAppealDesc());
+ entity.setStaffId(context.getUser().getCustomerId());
+ entity.setCreateUserId(context.getUser().getId());
+
PerformAttendAppealEntity saveEntity = appealService.save(entity, context);
rest.setData(saveEntity);
recordSysLog(request, busiDesc + " 銆愭垚鍔熴€�");
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/web/FeedbackApiController.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/web/FeedbackApiController.java
index c3797ea987fb38923c31023b2b08babe5c422bbb..5ac0983b7a5ac40e8dd604618bfc13e59b202883 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/web/FeedbackApiController.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/web/FeedbackApiController.java
@@ -105,6 +105,8 @@ public class FeedbackApiController extends AbstractBaseController<FeedbackReq> {
model.put(PAGEINFO_KEY, pageAllInfo);
parsePageInfo(model, pageAllInfo);
+ rest.setData(model);
+
recordSysLog(request, busiDesc + " 銆愭垚鍔熴€�");
} catch (Exception e) {
log.error(busiDesc, e);
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/web/InspectApiController.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/web/InspectApiController.java
index b5c3155e18713c0a566cc46024baef967c2560bb..063b08e4cbdb4329e9c7b6a2932e29d3f3b2c9d9 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/web/InspectApiController.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/web/InspectApiController.java
@@ -7,17 +7,21 @@ import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context;
import com.mortals.framework.model.PageInfo;
import com.mortals.framework.model.Result;
-import com.mortals.xhx.busiz.req.AppealReq;
-import com.mortals.xhx.busiz.req.PerformReq;
-import com.mortals.xhx.busiz.rsp.AppealStatInfo;
+import com.mortals.xhx.busiz.req.*;
+import com.mortals.xhx.busiz.rsp.*;
import com.mortals.xhx.common.code.PerformTypeEnum;
import com.mortals.xhx.common.code.ProcessStatusEnum;
+import com.mortals.xhx.common.code.SubAddTypeEnum;
+import com.mortals.xhx.common.code.SubMethodEnum;
import com.mortals.xhx.common.utils.BeanUtil;
import com.mortals.xhx.module.check.model.*;
+import com.mortals.xhx.module.check.model.vo.CheckAllRecordVo;
import com.mortals.xhx.module.check.service.*;
-import com.mortals.xhx.module.perform.model.PerformAttendAppealEntity;
-import com.mortals.xhx.module.perform.model.PerformAttendAppealQuery;
-import com.mortals.xhx.module.perform.service.PerformAttendAppealService;
+import com.mortals.xhx.module.perform.model.*;
+import com.mortals.xhx.module.perform.service.*;
+import com.mortals.xhx.module.staff.model.StaffEntity;
+import com.mortals.xhx.module.staff.model.StaffQuery;
+import com.mortals.xhx.module.staff.service.StaffService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -30,7 +34,9 @@ import org.springframework.web.bind.annotation.RestController;
import java.math.BigDecimal;
import java.util.Date;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
import static com.mortals.framework.ap.SysConstains.*;
import static com.mortals.xhx.common.key.ErrorCode.ERROR_TOKEN_EXPIRED;
@@ -47,6 +53,27 @@ import static com.mortals.xhx.common.key.ErrorCode.ERROR_TOKEN_EXPIRED_CONTENT;
@RequestMapping("/api/v1/inspect")
public class InspectApiController extends AbstractBaseController<PerformReq> {
+ @Autowired
+ private PerformAttendRecordService attendRecordService;
+ @Autowired
+ private PerformReviewRecordService reviewRecordService;
+ @Autowired
+ private PerformComplainRecordService complainRecordService;
+ @Autowired
+ private PerformGoworkRecordService performGoworkRecordService;
+ @Autowired
+ private PerformEffectRecordService effectRecordService;
+ @Autowired
+ private PerformOtherRecordService otherRecordService;
+ @Autowired
+ private PerformRulesService rulesService;
+ @Autowired
+ private StaffService staffService;
+
+ @Autowired
+ private CheckAllRecordService checkAllRecordService;
+
+
@Autowired
private CheckAttendRecordService checkAttendRecordService;
@Autowired
@@ -61,30 +88,117 @@ public class InspectApiController extends AbstractBaseController<PerformReq> {
private CheckOtherRecordService checkOtherRecordService;
- @Autowired
- private PerformAttendAppealService appealService;
-
/**
- * 涓汉鐢宠瘔缁╂晥缁熻
+ * 涓汉宸℃煡鏁堢粺璁�
*/
@PostMapping(value = "stat")
- public Rest<AppealStatInfo> appealStat() {
- String busiDesc = "H5涓汉鐢宠瘔缁╂晥缁熻";
- Rest<AppealStatInfo> rest = Rest.ok(busiDesc + " 銆愭垚鍔熴€�");
+ public Rest<InspectStatInfo> inspectStat() {
+ String busiDesc = "H5 涓汉宸℃煡缁熻";
+ Rest<InspectStatInfo> rest = Rest.ok(busiDesc + " 銆愭垚鍔熴€�");
Context context = this.getContext();
+
if (ObjectUtils.isEmpty(context) || ObjectUtils.isEmpty(context.getUser())) {
throw new AppException(ERROR_TOKEN_EXPIRED, ERROR_TOKEN_EXPIRED_CONTENT);
}
log.info("銆恵}銆戙€愯姹備綋銆�--> 鐢ㄦ埛:{}", busiDesc, context.getUser().getRealName());
try {
- //todo 鏌ヨ褰撳墠鐧诲綍浜虹殑缁╂晥鍒嗘暟
- AppealStatInfo appealStatInfo = new AppealStatInfo();
- appealStatInfo.setTotalScore(new BigDecimal("10.52"));
- appealStatInfo.setTotalTimes(12);
- appealStatInfo.setTodayScore(new BigDecimal("2.5"));
- appealStatInfo.setTodayTimes(3);
- rest.setData(appealStatInfo);
+ //todo
+ InspectStatInfo performStatInfo = new InspectStatInfo();
+ performStatInfo.setTotalTimes(12);
+ performStatInfo.setTodayTimes(4);
+ rest.setData(performStatInfo);
+ recordSysLog(request, busiDesc + " 銆愭垚鍔熴€�");
+ } catch (Exception e) {
+ log.error(busiDesc, e);
+ rest = Rest.fail(super.convertException(e));
+ }
+ return rest;
+ }
+
+
+ /**
+ * 涓汉宸℃煡鍒楄〃
+ */
+ @PostMapping(value = "list")
+ public Rest<Object> performList(@RequestBody PerformReq performReq) {
+ String busiDesc = "涓汉宸℃煡鍒楄〃";
+ log.info("銆恵}銆戙€愯姹備綋銆�--> {}", busiDesc, JSONObject.toJSONString(performReq));
+ Rest<Object> rest = Rest.ok();
+ Map<String, Object> model = new HashMap<>();
+ Context context = this.getContext();
+
+ if (ObjectUtils.isEmpty(context) || ObjectUtils.isEmpty(context.getUser())) {
+ throw new AppException(ERROR_TOKEN_EXPIRED, ERROR_TOKEN_EXPIRED_CONTENT);
+ }
+ try {
+ if (ObjectUtils.isEmpty(performReq.getPerformStartDate())) {
+ //鏈缃椂闂寸殑鎯呭喌锛岄粯璁や负褰撴湀
+ performReq.setPerformStartDate(DateUtil.beginOfMonth(new Date()).toDateStr());
+ performReq.setPerformEndDate(DateUtil.today());
+ } else {
+ performReq.setPerformStartDate(DateUtil.beginOfMonth(DateUtil.parse(performReq.getPerformStartDate()).toJdkDate()).toDateStr());
+ performReq.setPerformEndDate(DateUtil.endOfMonth(DateUtil.parse(performReq.getPerformStartDate()).toJdkDate()).toDateStr());
+ }
+ CheckAllRecordQuery query = new CheckAllRecordQuery();
+ query.setCheckTimeStart(performReq.getPerformStartDate());
+ query.setCheckTimeEnd(performReq.getPerformEndDate());
+ query.setCreateUserId(context.getUser().getCustomerId());
+ if (PerformTypeEnum.鍏ㄩ儴.getValue().equals(performReq.getPerformType())) {
+ List<CheckAllRecordVo> allCheckRecord = checkAllRecordService.getAllCheckRecord(query);
+ List<PerformInfo> collect = allCheckRecord.stream().map(item -> {
+ PerformInfo performInfo = new PerformInfo();
+ BeanUtils.copyProperties(item, performInfo, BeanUtil.getNullPropertyNames(item));
+ return performInfo;
+ }).collect(Collectors.toList());
+ model.put(KEY_RESULT_DATA, collect);
+ PageInfo pageAllInfo = new PageInfo();
+ pageAllInfo.setTotalResult(collect.size());
+ pageAllInfo.setCurrPage(1);
+ pageAllInfo.setPrePageResult(-1);
+ model.put(PAGEINFO_KEY, pageAllInfo);
+ parsePageInfo(model, pageAllInfo);
+
+ }
+ if(!ObjectUtils.isEmpty(performReq.getProcessStatus())){
+ query.setCheckStatus(performReq.getProcessStatus());
+ List<CheckAllRecordVo> allCheckRecord = checkAllRecordService.getAllCheckRecord(query);
+ List<PerformInfo> collect = allCheckRecord.stream().map(item -> {
+ PerformInfo performInfo = new PerformInfo();
+ BeanUtils.copyProperties(item, performInfo, BeanUtil.getNullPropertyNames(item));
+ return performInfo;
+ }).collect(Collectors.toList());
+ model.put(KEY_RESULT_DATA, collect);
+ PageInfo pageAllInfo = new PageInfo();
+ pageAllInfo.setTotalResult(collect.size());
+ pageAllInfo.setCurrPage(1);
+ pageAllInfo.setPrePageResult(-1);
+ model.put(PAGEINFO_KEY, pageAllInfo);
+ parsePageInfo(model, pageAllInfo);
+ }
+ if(!ObjectUtils.isEmpty(performReq.getScoreType())){
+ query.setSubMethod(performReq.getScoreType());
+ List<CheckAllRecordVo> allCheckRecord = checkAllRecordService.getAllCheckRecord(query);
+ List<PerformInfo> collect = allCheckRecord.stream().map(item -> {
+ PerformInfo performInfo = new PerformInfo();
+ BeanUtils.copyProperties(item, performInfo, BeanUtil.getNullPropertyNames(item));
+ return performInfo;
+ }).collect(Collectors.toList());
+ model.put(KEY_RESULT_DATA, collect);
+ PageInfo pageAllInfo = new PageInfo();
+ pageAllInfo.setTotalResult(collect.size());
+ pageAllInfo.setCurrPage(1);
+ pageAllInfo.setPrePageResult(-1);
+ model.put(PAGEINFO_KEY, pageAllInfo);
+ parsePageInfo(model, pageAllInfo);
+ }
+
+
+// model.put(KEY_RESULT_DATA, result.getList());
+// model.put(PAGEINFO_KEY, result.getPageInfo());
+// parsePageInfo(model, result.getPageInfo());
+
+ rest.setData(model);
recordSysLog(request, busiDesc + " 銆愭垚鍔熴€�");
} catch (Exception e) {
log.error(busiDesc, e);
@@ -98,56 +212,40 @@ public class InspectApiController extends AbstractBaseController<PerformReq> {
* 宸℃煡鏂板
*/
@PostMapping(value = "save")
- public Rest<PerformAttendAppealEntity> appealSave(@RequestBody AppealReq req) {
- String busiDesc = "涓汉鐢宠瘔鏂板";
+ public Rest<PerformAttendAppealEntity> appealSave(@RequestBody InspectSaveReq req) {
+ String busiDesc = "涓汉宸℃煡璁板綍鏂板";
log.info("銆恵}銆戙€愯姹備綋銆�--> {}", busiDesc, JSONObject.toJSONString(req));
Rest<PerformAttendAppealEntity> rest = Rest.ok(busiDesc + " 銆愭垚鍔熴€�");
Context context = this.getContext();
+ // req.setStaffId(context.getUser().getCustomerId());
try {
//鏍规嵁鐘舵€� 鏌ヨ 褰撳墠鏄惁宸茬粡瀛樺湪姝ｅ湪杩涜鐨勭敵璇�
- if (ObjectUtils.isEmpty(req.getId())) throw new AppException("鏍告煡璁板綍Id涓嶈兘涓虹┖锛�");
- if (ObjectUtils.isEmpty(req.getPerformType())) throw new AppException("缁╂晥绫诲瀷涓嶈兘涓虹┖锛�");
- //鏌ヨ褰撳墠鏍告煡鏄惁宸插瓨鍦ㄨ繘琛屼腑鐨勭敵璇夎褰�
- PerformAttendAppealEntity appealEntity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(req.getId()));
- if (!ObjectUtils.isEmpty(appealEntity) && appealEntity.getProcessStatus() == ProcessStatusEnum.鏈鐞�.getValue()) {
- throw new AppException("褰撳墠缁╂晥鏍告煡宸茬粡瀛樺湪姝ｅ湪杩涜涓殑鐢宠瘔璁板綍锛�");
+ if (ObjectUtils.isEmpty(context) || ObjectUtils.isEmpty(context.getUser())) {
+ throw new AppException(ERROR_TOKEN_EXPIRED, ERROR_TOKEN_EXPIRED_CONTENT);
}
- PerformAttendAppealEntity entity = new PerformAttendAppealEntity();
- entity.initAttrValue();
+ if (ObjectUtils.isEmpty(req.getPerformType())) throw new AppException("缁╂晥绫诲瀷涓嶈兘涓虹┖锛�");
if (PerformTypeEnum.鑰冨嫟缁╂晥.getValue().equals(req.getPerformType())) {
- CheckAttendRecordEntity checkEntity = checkAttendRecordService.get(req.getId(), context);
- BeanUtils.copyProperties(checkEntity, entity, BeanUtil.getNullPropertyNames(checkEntity));
-
+ boolean bool = attend(req,context);
+ if (bool) throw new AppException(busiDesc + "澶辫触锛�");
} else if (PerformTypeEnum.璇勪环宸瘎缁╂晥.getValue().equals(req.getPerformType())) {
- CheckReviewRecordEntity checkEntity = checkReviewRecordService.get(req.getId(), context);
- BeanUtils.copyProperties(checkEntity, entity, BeanUtil.getNullPropertyNames(checkEntity));
-
+ boolean bool = review(req,context);
+ if (bool) throw new AppException(busiDesc + "澶辫触锛�");
} else if (PerformTypeEnum.璇勪环鎶曡瘔缁╂晥.getValue().equals(req.getPerformType())) {
- CheckComplainRecordEntity checkEntity = checkComplainRecordService.get(req.getId(), context);
- BeanUtils.copyProperties(checkEntity, entity, BeanUtil.getNullPropertyNames(checkEntity));
-
+ boolean bool = complain(req,context);
+ if (bool) throw new AppException(busiDesc + "澶辫触锛�");
} else if (PerformTypeEnum.鍔炰欢缁╂晥.getValue().equals(req.getPerformType())) {
- CheckGoworkRecordEntity checkEntity = checkGoworkRecordService.get(req.getId(), context);
- BeanUtils.copyProperties(checkEntity, entity, BeanUtil.getNullPropertyNames(checkEntity));
-
+ boolean bool = gowork(req,context);
+ if (bool) throw new AppException(busiDesc + "澶辫触锛�");
} else if (PerformTypeEnum.鏁堣兘缁╂晥.getValue().equals(req.getPerformType())) {
- CheckEffectRecordEntity checkEntity = checkEffectRecordService.get(req.getId(), context);
- BeanUtils.copyProperties(checkEntity, entity, BeanUtil.getNullPropertyNames(checkEntity));
-
+ boolean bool = effect(req,context);
+ if (bool) throw new AppException(busiDesc + "澶辫触锛�");
} else if (PerformTypeEnum.鍏跺畠缁╂晥.getValue().equals(req.getPerformType())) {
- CheckOtherRecordEntity checkEntity = checkOtherRecordService.get(req.getId(), context);
- BeanUtils.copyProperties(checkEntity, entity, BeanUtil.getNullPropertyNames(checkEntity));
-
+ boolean bool = other(req,context);
+ if (bool) throw new AppException(busiDesc + "澶辫触锛�");
} else {
throw new AppException("涓嶆敮鎸佸綋鍓嶇哗鏁堢被鍨�");
}
- entity.setPerformType(req.getPerformType());
- entity.setPerformAttendAppealFilesList(req.getPerformAttendAppealFilesList());
- entity.setProcessStatus(1);
- entity.setAppealDesc(req.getAppealDesc());
- PerformAttendAppealEntity saveEntity = appealService.save(entity, context);
- rest.setData(saveEntity);
recordSysLog(request, busiDesc + " 銆愭垚鍔熴€�");
} catch (Exception e) {
log.error(busiDesc, e);
@@ -158,17 +256,242 @@ public class InspectApiController extends AbstractBaseController<PerformReq> {
}
- protected PageInfo buildPageInfo(AppealReq query) {
- PageInfo pageInfo = new PageInfo();
- if (!ObjectUtils.isEmpty(query) && !ObjectUtils.isEmpty(query.getPage())) {
- pageInfo.setCurrPage(query.getPage());
- }
- if (!ObjectUtils.isEmpty(query) && !ObjectUtils.isEmpty(query.getSize())) {
- pageInfo.setPrePageResult(query.getSize());
+
+
+ private boolean attend(InspectSaveReq req,Context context) throws AppException {
+ //鑰冨嫟淇濆瓨
+ PerformRulesEntity rule = getRule(req.getRuleId().toString());
+ StaffEntity staffEntity = getStaff(req.getStaffId().toString());
+
+ PerformAttendRecordEntity recordEntity = new PerformAttendRecordEntity();
+ recordEntity.initAttrValue();
+ BeanUtils.copyProperties(req, recordEntity);
+ recordEntity.setStaffId(staffEntity.getId());
+ recordEntity.setStaffName(staffEntity.getName());
+
+ recordEntity.setDeptId(staffEntity.getDeptId());
+ recordEntity.setDeptName(staffEntity.getDeptName());
+
+ recordEntity.setSubAddType(rule.getSubAddType());
+ recordEntity.setScore(rule.getScore());
+ recordEntity.setRuleId(rule.getId());
+ recordEntity.setRuleNme(rule.getName());
+ recordEntity.setCategoryId(rule.getCategoryId());
+ recordEntity.setCategoryName(rule.getCategoryName());
+ recordEntity.setSubMethod(SubMethodEnum.澶у巺宸℃煡.getValue());
+
+ recordEntity.setCreateUserId(context.getUser().getCustomerId());
+ recordEntity.setCreateTime(new Date());
+ PerformAttendRecordEntity save = attendRecordService.save(recordEntity);
+
+ return save.newEntity();
+
+ }
+
+
+ private boolean review(InspectSaveReq req,Context context) throws AppException {
+ //璇勪环淇濆瓨
+ StaffEntity staffEntity = getStaff(req.getStaffId().toString());
+ PerformRulesEntity rule = getRule(req.getRuleId().toString());
+
+ PerformReviewRecordEntity recordEntity = new PerformReviewRecordEntity();
+
+ recordEntity.initAttrValue();
+ BeanUtils.copyProperties(req, recordEntity);
+ // recordEntity.setStaffId(staffEntity.getId());
+ recordEntity.setStaffName(staffEntity.getName());
+
+ recordEntity.setDeptId(staffEntity.getDeptId());
+ recordEntity.setDeptName(staffEntity.getDeptName());
+ recordEntity.setSubAddType(rule.getSubAddType());
+ recordEntity.setScore(rule.getScore());
+ recordEntity.setRuleId(rule.getId());
+ recordEntity.setRuleName(rule.getName());
+ recordEntity.setCategoryId(rule.getCategoryId());
+ recordEntity.setCategoryName(rule.getCategoryName());
+ recordEntity.setSubMethod(SubMethodEnum.澶у巺宸℃煡.getValue());
+ recordEntity.setCreateUserId(context.getUser().getCustomerId());
+ recordEntity.setCreateTime(new Date());
+ PerformReviewRecordEntity save = reviewRecordService.save(recordEntity);
+ return save.newEntity();
+
+ }
+
+ private boolean complain(InspectSaveReq req,Context context) throws AppException {
+ //鎶曡瘔淇濆瓨
+ StaffEntity staffEntity = getStaff(req.getStaffId().toString());
+ PerformRulesEntity rule = getRule(req.getRuleId().toString());
+
+ PerformComplainRecordEntity recordEntity = new PerformComplainRecordEntity();
+
+ recordEntity.initAttrValue();
+ BeanUtils.copyProperties(req, recordEntity);
+ // recordEntity.setStaffId(staffEntity.getId());
+ recordEntity.setStaffName(staffEntity.getName());
+
+ recordEntity.setDeptId(staffEntity.getDeptId());
+ recordEntity.setDeptName(staffEntity.getDeptName());
+
+ recordEntity.setSubAddType(rule.getSubAddType());
+ recordEntity.setScore(rule.getScore());
+ recordEntity.setRuleId(rule.getId());
+ recordEntity.setRuleName(rule.getName());
+ recordEntity.setCategoryId(rule.getCategoryId());
+ recordEntity.setCategoryName(rule.getCategoryName());
+ recordEntity.setSubMethod(SubMethodEnum.澶у巺宸℃煡.getValue());
+ recordEntity.setDeductTime(new Date());
+
+ recordEntity.setCreateUserId(context.getUser().getCustomerId());
+ recordEntity.setCreateTime(new Date());
+ PerformComplainRecordEntity save = complainRecordService.save(recordEntity);
+ return save.newEntity();
+
+ }
+
+ private boolean gowork(InspectSaveReq req,Context context) throws AppException {
+ //鍔炰欢淇濆瓨
+ StaffEntity staffEntity = getStaff(req.getStaffId().toString());
+ PerformRulesEntity rule = getRule(req.getRuleId().toString());
+
+ PerformGoworkRecordEntity recordEntity = new PerformGoworkRecordEntity();
+
+ recordEntity.initAttrValue();
+ BeanUtils.copyProperties(req, recordEntity);
+ // recordEntity.setStaffId(staffEntity.getId());
+ recordEntity.setStaffName(staffEntity.getName());
+
+ recordEntity.setDeptId(staffEntity.getDeptId());
+ recordEntity.setDeptName(staffEntity.getDeptName());
+ recordEntity.setSubAddType(rule.getSubAddType());
+ recordEntity.setScore(rule.getScore());
+ recordEntity.setRuleId(rule.getId());
+ recordEntity.setRuleName(rule.getName());
+ recordEntity.setCategoryId(rule.getCategoryId());
+ recordEntity.setCategoryName(rule.getCategoryName());
+ recordEntity.setSubMethod(SubMethodEnum.澶у巺宸℃煡.getValue());
+ recordEntity.setCreateUserId(1L);
+ recordEntity.setCreateTime(new Date());
+ PerformGoworkRecordEntity save = performGoworkRecordService.save(recordEntity);
+ return save.newEntity();
+
+ }
+
+ private boolean effect(InspectSaveReq req,Context context) throws AppException {
+ //鏁堣兘淇濆瓨
+ StaffEntity staffEntity = getStaff(req.getStaffId().toString());
+ PerformRulesEntity rule = getRule(req.getRuleId().toString());
+
+ PerformEffectRecordEntity recordEntity = new PerformEffectRecordEntity();
+
+ recordEntity.initAttrValue();
+ BeanUtils.copyProperties(req, recordEntity);
+ //recordEntity.setStaffId(staffEntity.getId());
+ recordEntity.setStaffName(staffEntity.getName());
+
+ recordEntity.setDeptId(staffEntity.getDeptId());
+ recordEntity.setDeptName(staffEntity.getDeptName());
+ recordEntity.setSubAddType(rule.getSubAddType());
+ recordEntity.setScore(rule.getScore());
+ recordEntity.setRuleId(rule.getId());
+ recordEntity.setRuleName(rule.getName());
+ recordEntity.setCategoryId(rule.getCategoryId());
+ recordEntity.setCategoryName(rule.getCategoryName());
+ recordEntity.setSubMethod(SubMethodEnum.澶у巺宸℃煡.getValue());
+ recordEntity.setCreateUserId(context.getUser().getCustomerId());
+ recordEntity.setCreateTime(new Date());
+ PerformEffectRecordEntity save = effectRecordService.save(recordEntity);
+ return save.newEntity();
+ }
+
+ private boolean other(InspectSaveReq req,Context context) throws AppException {
+ //鍏跺畠淇濆瓨
+
+ StaffEntity staffEntity = getStaff(req.getStaffId().toString());
+ PerformRulesEntity rule = getRule(req.getRuleId().toString());
+
+ PerformOtherRecordEntity recordEntity = new PerformOtherRecordEntity();
+
+ recordEntity.initAttrValue();
+ BeanUtils.copyProperties(req, recordEntity);
+ //recordEntity.setStaffId(staffEntity.getId());
+ recordEntity.setStaffName(staffEntity.getName());
+
+ recordEntity.setDeptId(staffEntity.getDeptId());
+ recordEntity.setDeptName(staffEntity.getDeptName());
+ recordEntity.setSubAddType(rule.getSubAddType());
+ recordEntity.setScore(rule.getScore());
+ recordEntity.setRuleId(rule.getId());
+ recordEntity.setRuleName(rule.getName());
+ recordEntity.setCategoryId(rule.getCategoryId());
+ recordEntity.setCategoryName(rule.getCategoryName());
+ recordEntity.setSubMethod(SubMethodEnum.澶у巺宸℃煡.getValue());
+ recordEntity.setCreateUserId(context.getUser().getCustomerId());
+ recordEntity.setCreateTime(new Date());
+ PerformOtherRecordEntity save = otherRecordService.save(recordEntity);
+ return save.newEntity();
+ }
+
+ /**
+ * 璇︾粏
+ */
+ @PostMapping(value = "info")
+ public Rest<PerformDetailInfo> performInfo(@RequestBody PerformReq performReq) {
+ Context context = this.getContext();
+ String busiDesc = "涓汉宸℃煡璇︾粏";
+ log.info("銆恵}銆戙€愯姹備綋銆�--> {}", busiDesc, JSONObject.toJSONString(performReq));
+ Rest<PerformDetailInfo> rest = Rest.ok(busiDesc + " 銆愭垚鍔熴€�");
+ try {
+ if (ObjectUtils.isEmpty(performReq.getId())) {
+ throw new AppException("璇︾粏鏌ヨid涓嶈兘涓虹┖!");
+ }
+ PerformDetailInfo performDetailInfo = new PerformDetailInfo();
+ if (PerformTypeEnum.鑰冨嫟缁╂晥.getValue().equals(performReq.getPerformType())) {
+ CheckAttendRecordEntity checkEntity = checkAttendRecordService.get(performReq.getId(), context);
+ BeanUtils.copyProperties(checkEntity, performDetailInfo, BeanUtil.getNullPropertyNames(checkEntity));
+ } else if (PerformTypeEnum.璇勪环宸瘎缁╂晥.getValue().equals(performReq.getPerformType())) {
+ CheckReviewRecordEntity checkEntity = checkReviewRecordService.get(performReq.getId(), context);
+ BeanUtils.copyProperties(checkEntity, performDetailInfo, BeanUtil.getNullPropertyNames(checkEntity));
+ } else if (PerformTypeEnum.璇勪环鎶曡瘔缁╂晥.getValue().equals(performReq.getPerformType())) {
+ CheckComplainRecordEntity checkEntity = checkComplainRecordService.get(performReq.getId(), context);
+ BeanUtils.copyProperties(checkEntity, performDetailInfo, BeanUtil.getNullPropertyNames(checkEntity));
+ } else if (PerformTypeEnum.鍔炰欢缁╂晥.getValue().equals(performReq.getPerformType())) {
+ CheckGoworkRecordEntity checkEntity = checkGoworkRecordService.get(performReq.getId(), context);
+ BeanUtils.copyProperties(checkEntity, performDetailInfo, BeanUtil.getNullPropertyNames(checkEntity));
+ } else if (PerformTypeEnum.鏁堣兘缁╂晥.getValue().equals(performReq.getPerformType())) {
+ CheckEffectRecordEntity checkEntity = checkEffectRecordService.get(performReq.getId(), context);
+ BeanUtils.copyProperties(checkEntity, performDetailInfo, BeanUtil.getNullPropertyNames(checkEntity));
+ } else if (PerformTypeEnum.鍏跺畠缁╂晥.getValue().equals(performReq.getPerformType())) {
+ CheckOtherRecordEntity checkEntity = checkOtherRecordService.get(performReq.getId(), context);
+ BeanUtils.copyProperties(checkEntity, performDetailInfo, BeanUtil.getNullPropertyNames(checkEntity));
+ } else {
+ throw new AppException("涓嶆敮鎸佸綋鍓嶇哗鏁堢被鍨�");
+ }
+
+ rest.setData(performDetailInfo);
+ recordSysLog(request, busiDesc + " 銆愭垚鍔熴€�");
+ } catch (Exception e) {
+ log.error(busiDesc, e);
+ rest = Rest.fail(super.convertException(e));
}
+ return rest;
+ }
+
+ private PerformRulesEntity getRule(String ruleId) {
+ PerformRulesEntity rule = rulesService.getCache(ruleId);
+ if (ObjectUtils.isEmpty(rule))
+ throw new AppException(String.format("褰撳墠鎵嬫満鍙风爜鏈壘鍒板尮閰嶇殑鍛樺伐锛乺ule:%s", ruleId));
+
+ return rule;
+ }
+
+
+ private StaffEntity getStaff(String staffId) {
+ StaffEntity staffEntity = staffService.getCache(staffId);
+ if (ObjectUtils.isEmpty(staffEntity))
+ throw new AppException(String.format("褰撳墠id鏈壘鍒板尮閰嶇殑鍛樺伐锛乻taffId:%s", staffId));
- return pageInfo;
+ return staffEntity;
}
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/web/PerformApiController.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/web/PerformApiController.java
index 457026d7f191756c56e5a3ca15218e5d0f9394b2..fa969ebf8e91ab47acf7158fe90a32af4aae8035 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/web/PerformApiController.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/web/PerformApiController.java
@@ -167,9 +167,12 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
performInfo.setPerformType(PerformTypeEnum.鑰冨嫟缁╂晥.getValue());
//鍒ゆ柇鏄惁瀛樺湪鐢宠瘔
PerformAttendAppealEntity entity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(item.getId()));
- Boolean bool = entity.newEntity();
- updateAppealStatus(performInfo, bool, entity.getProcessStatus(), entity.getAppealResult());
-
+ if (!ObjectUtils.isEmpty(entity)) {
+ Boolean bool = entity.newEntity();
+ updateAppealStatus(performInfo, bool, entity.getProcessStatus(), entity.getAppealResult());
+ } else {
+ performInfo.setAppealStatus(AppealStatusEnum.鏈敵璇�.getValue());
+ }
return performInfo;
}).collect(Collectors.toList());
@@ -190,9 +193,13 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
performInfo.setPerformType(PerformTypeEnum.璇勪环宸瘎缁╂晥.getValue());
//鍒ゆ柇鏄惁瀛樺湪鐢宠瘔
PerformAttendAppealEntity entity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(item.getId()));
- Boolean bool = entity.newEntity();
- updateAppealStatus(performInfo, bool, entity.getProcessStatus(), entity.getAppealResult());
+ if (!ObjectUtils.isEmpty(entity)) {
+ Boolean bool = entity.newEntity();
+ updateAppealStatus(performInfo, bool, entity.getProcessStatus(), entity.getAppealResult());
+ } else {
+ performInfo.setAppealStatus(AppealStatusEnum.鏈敵璇�.getValue());
+ }
return performInfo;
}).collect(Collectors.toList());
model.put(KEY_RESULT_DATA, collect);
@@ -212,8 +219,12 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
//鍒ゆ柇鏄惁瀛樺湪鐢宠瘔
PerformAttendAppealEntity entity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(item.getId()));
- Boolean bool = entity.newEntity();
- updateAppealStatus(performInfo, bool, entity.getProcessStatus(), entity.getAppealResult());
+ if (!ObjectUtils.isEmpty(entity)) {
+ Boolean bool = entity.newEntity();
+ updateAppealStatus(performInfo, bool, entity.getProcessStatus(), entity.getAppealResult());
+ } else {
+ performInfo.setAppealStatus(AppealStatusEnum.鏈敵璇�.getValue());
+ }
return performInfo;
}).collect(Collectors.toList());
model.put(KEY_RESULT_DATA, collect);
@@ -232,8 +243,14 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
performInfo.setPerformType(PerformTypeEnum.鍔炰欢缁╂晥.getValue());
//鍒ゆ柇鏄惁瀛樺湪鐢宠瘔
PerformAttendAppealEntity entity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(item.getId()));
- Boolean bool = entity.newEntity();
- updateAppealStatus(performInfo, bool, entity.getProcessStatus(), entity.getAppealResult());
+
+ if (!ObjectUtils.isEmpty(entity)) {
+ Boolean bool = entity.newEntity();
+ updateAppealStatus(performInfo, bool, entity.getProcessStatus(), entity.getAppealResult());
+ } else {
+ performInfo.setAppealStatus(AppealStatusEnum.鏈敵璇�.getValue());
+ }
+
return performInfo;
}).collect(Collectors.toList());
model.put(KEY_RESULT_DATA, collect);
@@ -252,8 +269,12 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
performInfo.setPerformType(PerformTypeEnum.鏁堣兘缁╂晥.getValue());
//鍒ゆ柇鏄惁瀛樺湪鐢宠瘔
PerformAttendAppealEntity entity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(item.getId()));
- Boolean bool = entity.newEntity();
- updateAppealStatus(performInfo, bool, entity.getProcessStatus(), entity.getAppealResult());
+ if (!ObjectUtils.isEmpty(entity)) {
+ Boolean bool = entity.newEntity();
+ updateAppealStatus(performInfo, bool, entity.getProcessStatus(), entity.getAppealResult());
+ } else {
+ performInfo.setAppealStatus(AppealStatusEnum.鏈敵璇�.getValue());
+ }
return performInfo;
}).collect(Collectors.toList());
model.put(KEY_RESULT_DATA, collect);
@@ -272,8 +293,13 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
performInfo.setPerformType(PerformTypeEnum.鍏跺畠缁╂晥.getValue());
//鍒ゆ柇鏄惁瀛樺湪鐢宠瘔
PerformAttendAppealEntity entity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(item.getId()));
- Boolean bool = entity.newEntity();
- updateAppealStatus(performInfo, bool, entity.getProcessStatus(), entity.getAppealResult());
+
+ if (!ObjectUtils.isEmpty(entity)) {
+ Boolean bool = entity.newEntity();
+ updateAppealStatus(performInfo, bool, entity.getProcessStatus(), entity.getAppealResult());
+ } else {
+ performInfo.setAppealStatus(AppealStatusEnum.鏈敵璇�.getValue());
+ }
return performInfo;
}).collect(Collectors.toList());
model.put(KEY_RESULT_DATA, collect);
@@ -327,6 +353,7 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
if (PerformTypeEnum.鑰冨嫟缁╂晥.getValue().equals(performReq.getPerformType())) {
CheckAttendRecordEntity checkEntity = checkAttendRecordService.get(performReq.getId(), context);
BeanUtils.copyProperties(checkEntity, performDetailInfo, BeanUtil.getNullPropertyNames(checkEntity));
+
} else if (PerformTypeEnum.璇勪环宸瘎缁╂晥.getValue().equals(performReq.getPerformType())) {
CheckReviewRecordEntity checkEntity = checkReviewRecordService.get(performReq.getId(), context);
BeanUtils.copyProperties(checkEntity, performDetailInfo, BeanUtil.getNullPropertyNames(checkEntity));
@@ -346,6 +373,21 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
throw new AppException("涓嶆敮鎸佸綋鍓嶇哗鏁堢被鍨�");
}
+ PerformAttendAppealEntity appealEntity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(performDetailInfo.getId()));
+ if (ObjectUtils.isEmpty(appealEntity)) {
+ performDetailInfo.setAppealStatus(AppealStatusEnum.鏈敵璇�.getValue());
+ } else {
+ if (ProcessStatusEnum.鏈鐞�.getValue() == appealEntity.getProcessStatus()) {
+ performDetailInfo.setAppealStatus(AppealStatusEnum.鐢宠瘔涓�.getValue());
+ } else {
+ if (AppealResultEnum.閫氳繃.getValue() == appealEntity.getProcessStatus()) {
+ performDetailInfo.setAppealStatus(AppealStatusEnum.鐢宠瘔閫氳繃.getValue());
+ } else if (AppealResultEnum.涓嶉€氳繃.getValue() == appealEntity.getProcessStatus()) {
+ performDetailInfo.setAppealStatus(AppealStatusEnum.鐢宠瘔鎷掔粷.getValue());
+ }
+ }
+ }
+
rest.setData(performDetailInfo);
recordSysLog(request, busiDesc + " 銆愭垚鍔熴€�");
} catch (Exception e) {
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/web/TestController.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/web/TestController.java
index 640787a278423b1d67e5c3395abc776a30ba51b6..a6cb73ea38b2cc1d11ee269670393c399be6a347 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/web/TestController.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/web/TestController.java
@@ -23,21 +23,22 @@ public class TestController {
@Autowired
private IdgeneratorService idgeneratorService;
- @GetMapping("webservice")
+// @GetMapping("webservice")@GetMapping("idGens")
+// public String idGens() {
+// log.info("娴嬭瘯id鐢熸垚");
+//
+// String stringId = idgeneratorService.getLongId(IdgeneratorServiceImpl.IdGeneratorKey.EFFECT).toString();
+//
+//
+// return stringId;
+// }
public String webservice() {
log.info("娴嬭瘯");
return "ok";
}
- @GetMapping("idGens")
- public String idGens() {
- log.info("娴嬭瘯id鐢熸垚");
-
- String stringId = idgeneratorService.getLongId(IdgeneratorServiceImpl.IdGeneratorKey.EFFECT_KEY).toString();
-
- return stringId;
- }
+//
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/common/code/CheckTypeEnum.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/common/code/CheckTypeEnum.java
index 2b5e8038902a02f4357b550182200c474480649a..aa5a6d8b4718303f760fc5821e9484c1f1ea85ca 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/common/code/CheckTypeEnum.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/common/code/CheckTypeEnum.java
@@ -4,7 +4,7 @@ import java.util.LinkedHashMap;
import java.util.Map;
/***
- * 鏍告煡绫诲瀷鏋氫妇(1.鑰冨嫟缁╂晥,2.鏁堣兘缁╂晥,3.璇勪环缁╂晥,4.鍔炰欢缁╂晥,5.璇勪环宸瘎缁╂晥,6.鍏跺畠缁╂晥)
+ * 鏍告煡绫诲瀷鏋氫妇(1.鑰冨嫟缁╂晥,2.璇勪环缁╂晥,3.鍔炰欢缁╂晥,4.鏁堣兘缁╂晥,5.鍏跺畠缁╂晥,6.鎶曡瘔缁╂晥)
*/
public enum CheckTypeEnum {
鑰冨嫟缁╂晥(1, "鑰冨嫟缁╂晥"),
@@ -12,6 +12,7 @@ public enum CheckTypeEnum {
鍔炰欢缁╂晥(3, "鍔炰欢缁╂晥"),
鏁堣兘缁╂晥(4, "鏁堣兘缁╂晥"),
鍏跺畠缁╂晥(5, "鍏跺畠缁╂晥"),
+ 鎶曡瘔缁╂晥(6, "鎶曡瘔缁╂晥"),
;
private Integer value;
private String desc;
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckAllRecordVo.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckAllRecordVo.java
index bfb2239b8d18cfc472c84dfb0583759ab0e91f70..c25964c716b1e9871acb7e3d4c0d8cdfd5b43e53 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckAllRecordVo.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckAllRecordVo.java
@@ -69,4 +69,7 @@ public class CheckAllRecordVo extends BaseEntityLong {
* 鏍告煡绫诲瀷(1.鑰冨嫟缁╂晥,2.鏁堣兘缁╂晥,3.璇勪环缁╂晥,4.鍔炰欢缁╂晥,5.璇勪环宸瘎缁╂晥,6.鍏跺畠缁╂晥)
*/
private Integer checkType;
+
+
+ private String performType;
}
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckAttendRecordController.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckAttendRecordController.java
index f6a0be8cabb3c7902c66dce605b4d6e5567a8cec..27f8f6cfe22318c5ea7bced2453f61ff7bd37849 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckAttendRecordController.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckAttendRecordController.java
@@ -1,55 +1,85 @@
package com.mortals.xhx.module.check.web;
+
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.OrderCol;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.common.code.CheckStatusEnum;
+import com.mortals.xhx.common.code.CheckTypeEnum;
+import com.mortals.xhx.common.code.SubAddTypeEnum;
+import com.mortals.xhx.common.code.SubMethodEnum;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import com.mortals.framework.model.Context;
+
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.module.check.model.CheckAttendRecordEntity;
import com.mortals.xhx.module.check.service.CheckAttendRecordService;
import org.apache.commons.lang3.ArrayUtils;
import com.mortals.framework.util.StringUtils;
+
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
+
import com.alibaba.fastjson.JSONObject;
+
import java.util.Arrays;
+
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
+
import static com.mortals.framework.ap.SysConstains.*;
+
/**
-*
-* 鑰冨嫟缁╂晥璁板綍鏍告煡淇℃伅
-*
-* @author zxfei
-* @date 2023-07-10
-*/
+ * 鑰冨嫟缁╂晥璁板綍鏍告煡淇℃伅
+ *
+ * @author zxfei
+ * @date 2023-07-10
+ */
@RestController
@RequestMapping("check/attend/record")
-public class CheckAttendRecordController extends BaseCRUDJsonBodyMappingController<CheckAttendRecordService,CheckAttendRecordEntity,Long> {
+public class CheckAttendRecordController extends BaseCRUDJsonBodyMappingController<CheckAttendRecordService, CheckAttendRecordEntity, Long> {
@Autowired
private ParamService paramService;
- public CheckAttendRecordController(){
- super.setModuleDesc( "鑰冨嫟缁╂晥璁板綍鏍告煡淇℃伅");
+ public CheckAttendRecordController() {
+ super.setModuleDesc("鑰冨嫟缁╂晥璁板綍鏍告煡淇℃伅");
}
@Override
protected void init(Map<String, Object> model, Context context) {
- this.addDict(model, "subAddType", paramService.getParamBySecondOrganize("CheckAttendRecord","subAddType"));
- this.addDict(model, "checkStatus", paramService.getParamBySecondOrganize("CheckAttendRecord","checkStatus"));
- this.addDict(model, "subMethod", paramService.getParamBySecondOrganize("CheckAttendRecord","subMethod"));
+ this.addDict(model, "checkStatus", CheckStatusEnum.getEnumMap());
+ this.addDict(model, "subMethod", SubMethodEnum.getEnumMap());
+ this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
+ this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
+
super.init(model, context);
}
+
+ @Override
+ protected void doListBefore(CheckAttendRecordEntity query, Map<String, Object> model, Context context) throws AppException {
+
+ if (ObjectUtils.isEmpty(query.getOrderColList())) {
+ query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
+ } else {
+ query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
+ }
+ super.doListBefore(query, model, context);
+ }
+
/**
* 瀹℃牳
+ *
* @param entity
* @return
*/
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckComplainRecordController.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckComplainRecordController.java
index bf3e584149f1187d19c5fada0d0f5986dd5bce43..e12ef4dc3cb7d3b84de6fe8f6d62cbb4064756a4 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckComplainRecordController.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckComplainRecordController.java
@@ -1,7 +1,14 @@
package com.mortals.xhx.module.check.web;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.OrderCol;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.common.code.CheckStatusEnum;
+import com.mortals.xhx.common.code.CheckTypeEnum;
+import com.mortals.xhx.common.code.SubAddTypeEnum;
+import com.mortals.xhx.common.code.SubMethodEnum;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
@@ -42,12 +49,24 @@ public class CheckComplainRecordController extends BaseCRUDJsonBodyMappingContro
@Override
protected void init(Map<String, Object> model, Context context) {
- this.addDict(model, "subMethod", paramService.getParamBySecondOrganize("CheckComplainRecord","subMethod"));
- this.addDict(model, "checkStatus", paramService.getParamBySecondOrganize("CheckComplainRecord","checkStatus"));
- this.addDict(model, "subAddType", paramService.getParamBySecondOrganize("CheckComplainRecord","subAddType"));
+
+ this.addDict(model, "checkStatus", CheckStatusEnum.getEnumMap());
+ this.addDict(model, "subMethod", SubMethodEnum.getEnumMap());
+ this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
+ this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
super.init(model, context);
}
+ @Override
+ protected void doListBefore(CheckComplainRecordEntity query, Map<String, Object> model, Context context) throws AppException {
+ super.doListBefore(query, model, context);
+ if (ObjectUtils.isEmpty(query.getOrderColList())) {
+ query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
+ } else {
+ query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
+ }
+ }
+
/**
* 瀹℃牳
* @param entity
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckEffectRecordController.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckEffectRecordController.java
index fe321429e1fda6b298177cd04964bcf67d92bf6d..ef00b9d025b4a95e44b4cf70606a098601f02233 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckEffectRecordController.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckEffectRecordController.java
@@ -1,7 +1,14 @@
package com.mortals.xhx.module.check.web;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.OrderCol;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.common.code.CheckStatusEnum;
+import com.mortals.xhx.common.code.CheckTypeEnum;
+import com.mortals.xhx.common.code.SubAddTypeEnum;
+import com.mortals.xhx.common.code.SubMethodEnum;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
@@ -43,12 +50,25 @@ public class CheckEffectRecordController extends BaseCRUDJsonBodyMappingControll
@Override
protected void init(Map<String, Object> model, Context context) {
this.addDict(model, "irregularType", paramService.getParamBySecondOrganize("CheckEffectRecord","irregularType"));
- this.addDict(model, "subMethod", paramService.getParamBySecondOrganize("CheckEffectRecord","subMethod"));
- this.addDict(model, "checkStatus", paramService.getParamBySecondOrganize("CheckEffectRecord","checkStatus"));
- this.addDict(model, "subAddType", paramService.getParamBySecondOrganize("CheckEffectRecord","subAddType"));
+ this.addDict(model, "checkStatus", CheckStatusEnum.getEnumMap());
+ this.addDict(model, "subMethod", SubMethodEnum.getEnumMap());
+ this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
+ this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
+
+
super.init(model, context);
}
+ @Override
+ protected void doListBefore(CheckEffectRecordEntity query, Map<String, Object> model, Context context) throws AppException {
+ super.doListBefore(query, model, context);
+ if (ObjectUtils.isEmpty(query.getOrderColList())) {
+ query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
+ } else {
+ query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
+ }
+ }
+
/**
* 瀹℃牳
* @param entity
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckGoworkRecordController.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckGoworkRecordController.java
index 253ed4e589ed7fde928657e726073878bbe3fefa..323c60ce96114cc3a6314cfcec402a9f80efc7c5 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckGoworkRecordController.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckGoworkRecordController.java
@@ -1,7 +1,14 @@
package com.mortals.xhx.module.check.web;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.OrderCol;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.common.code.CheckStatusEnum;
+import com.mortals.xhx.common.code.CheckTypeEnum;
+import com.mortals.xhx.common.code.SubAddTypeEnum;
+import com.mortals.xhx.common.code.SubMethodEnum;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
@@ -42,12 +49,24 @@ public class CheckGoworkRecordController extends BaseCRUDJsonBodyMappingControll
@Override
protected void init(Map<String, Object> model, Context context) {
- this.addDict(model, "subMethod", paramService.getParamBySecondOrganize("CheckGoworkRecord","subMethod"));
- this.addDict(model, "checkStatus", paramService.getParamBySecondOrganize("CheckGoworkRecord","checkStatus"));
- this.addDict(model, "subAddType", paramService.getParamBySecondOrganize("CheckGoworkRecord","subAddType"));
+
+ this.addDict(model, "checkStatus", CheckStatusEnum.getEnumMap());
+ this.addDict(model, "subMethod", SubMethodEnum.getEnumMap());
+ this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
+ this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
super.init(model, context);
}
+ @Override
+ protected void doListBefore(CheckGoworkRecordEntity query, Map<String, Object> model, Context context) throws AppException {
+ super.doListBefore(query, model, context);
+ if (ObjectUtils.isEmpty(query.getOrderColList())) {
+ query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
+ } else {
+ query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
+ }
+ }
+
/**
* 瀹℃牳
* @param entity
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckOtherRecordController.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckOtherRecordController.java
index 7940dcb9115da8998ee129de562ba70c0b5009a5..c0da88f60d2c6b814c9089edbe7b136ba4913e2a 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckOtherRecordController.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckOtherRecordController.java
@@ -1,7 +1,14 @@
package com.mortals.xhx.module.check.web;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.OrderCol;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.common.code.CheckStatusEnum;
+import com.mortals.xhx.common.code.CheckTypeEnum;
+import com.mortals.xhx.common.code.SubAddTypeEnum;
+import com.mortals.xhx.common.code.SubMethodEnum;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
@@ -43,12 +50,23 @@ public class CheckOtherRecordController extends BaseCRUDJsonBodyMappingControlle
@Override
protected void init(Map<String, Object> model, Context context) {
this.addDict(model, "irregularOtherType", paramService.getParamBySecondOrganize("CheckOtherRecord","irregularOtherType"));
- this.addDict(model, "subMethod", paramService.getParamBySecondOrganize("CheckOtherRecord","subMethod"));
- this.addDict(model, "checkStatus", paramService.getParamBySecondOrganize("CheckOtherRecord","checkStatus"));
- this.addDict(model, "subAddType", paramService.getParamBySecondOrganize("CheckOtherRecord","subAddType"));
+ this.addDict(model, "checkStatus", CheckStatusEnum.getEnumMap());
+ this.addDict(model, "subMethod", SubMethodEnum.getEnumMap());
+ this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
+ this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
super.init(model, context);
}
+ @Override
+ protected void doListBefore(CheckOtherRecordEntity query, Map<String, Object> model, Context context) throws AppException {
+ super.doListBefore(query, model, context);
+ if (ObjectUtils.isEmpty(query.getOrderColList())) {
+ query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
+ } else {
+ query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
+ }
+ }
+
/**
* 瀹℃牳
* @param entity
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckReviewRecordController.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckReviewRecordController.java
index e1e1e1dfe9a88b822b9e3af2ecab99e7df7aaf52..c2d1d3280be4dffe2dc773b1bbc281c8a87bce95 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckReviewRecordController.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckReviewRecordController.java
@@ -1,7 +1,14 @@
package com.mortals.xhx.module.check.web;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.OrderCol;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.common.code.CheckStatusEnum;
+import com.mortals.xhx.common.code.CheckTypeEnum;
+import com.mortals.xhx.common.code.SubAddTypeEnum;
+import com.mortals.xhx.common.code.SubMethodEnum;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
@@ -44,12 +51,25 @@ public class CheckReviewRecordController extends BaseCRUDJsonBodyMappingControll
protected void init(Map<String, Object> model, Context context) {
this.addDict(model, "reviewResult", paramService.getParamBySecondOrganize("CheckReviewRecord","reviewResult"));
this.addDict(model, "reviewSource", paramService.getParamBySecondOrganize("CheckReviewRecord","reviewSource"));
- this.addDict(model, "subMethod", paramService.getParamBySecondOrganize("CheckReviewRecord","subMethod"));
- this.addDict(model, "checkStatus", paramService.getParamBySecondOrganize("CheckReviewRecord","checkStatus"));
- this.addDict(model, "subAddType", paramService.getParamBySecondOrganize("CheckReviewRecord","subAddType"));
+
+ this.addDict(model, "checkStatus", CheckStatusEnum.getEnumMap());
+ this.addDict(model, "subMethod", SubMethodEnum.getEnumMap());
+ this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
+ this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
+
super.init(model, context);
}
+ @Override
+ protected void doListBefore(CheckReviewRecordEntity query, Map<String, Object> model, Context context) throws AppException {
+ super.doListBefore(query, model, context);
+ if (ObjectUtils.isEmpty(query.getOrderColList())) {
+ query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
+ } else {
+ query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
+ }
+ }
+
/**
* 瀹℃牳
* @param entity
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/dao/FeedbackDao.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/dao/FeedbackDao.java
index 2eb9d130e5406a6960385193579c16157aa5cb3d..080e1a815299bbeef624440f44d746340567b395 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/dao/FeedbackDao.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/dao/FeedbackDao.java
@@ -21,10 +21,10 @@ public interface FeedbackDao extends ICRUDDao<FeedbackEntity,Long>{
/***
* 闂嵎鍙嶉浜哄憳鍒楄〃
- * @param feedbackId
+ * @param query
* @return
*/
- List<FeedbackStaffInfoVo> getFeedbackStaffList(Long feedbackId);
+ Result<FeedbackStaffInfoVo> getFeedbackStaffList(FeedbackEntity query,PageInfo pageInfo);
/**
* 闂嵎鍗曢€夊閫夊弽棣堢粺璁�
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/dao/ibatis/FeedbackDaoImpl.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/dao/ibatis/FeedbackDaoImpl.java
index 9603f1609001137719d566f26d82494bb9ffeff2..64befc63f0b3832e56d7de1bebbdc6f41786e7af 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/dao/ibatis/FeedbackDaoImpl.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/dao/ibatis/FeedbackDaoImpl.java
@@ -28,8 +28,29 @@ public class FeedbackDaoImpl extends BaseCRUDDaoMybatis<FeedbackEntity,Long> imp
@Override
- public List<FeedbackStaffInfoVo> getFeedbackStaffList(Long feedbackId) {
- return this.getSqlSession().selectList(this.getSqlId("getFeedbackStaffList"), feedbackId);
+ public Result<FeedbackStaffInfoVo> getFeedbackStaffList(FeedbackEntity query,PageInfo pageInfo) {
+ String sqlId = "getFeedbackStaffList";
+
+ Result result = new Result();
+ List list = null;
+ int count = this.getFeedbackStaffListCount(query);
+ if (count == 0) {
+ list = new ArrayList();
+ } else if (pageInfo.getPrePageResult() == -1) {
+ list = this.getSqlSession().selectList(this.getSqlId(sqlId), query);
+ } else {
+ if (pageInfo.getBeginIndex() > count) {
+ pageInfo.setCurrPage(1);
+ }
+
+ RowBounds rowBounds = new RowBounds(pageInfo.getBeginIndex(), pageInfo.getPrePageResult());
+ list = this.getSqlSession().selectList(this.getSqlId(sqlId), query, rowBounds);
+ }
+
+ pageInfo.setTotalResult(count);
+ result.setPageInfo(pageInfo);
+ result.setList((List)list);
+ return result;
}
@Override
@@ -66,4 +87,8 @@ public class FeedbackDaoImpl extends BaseCRUDDaoMybatis<FeedbackEntity,Long> imp
private int getQuestionAnswerListCount(Long questionId) {
return (Integer)this.getSqlSession().selectOne(this.getSqlId("getQuestionAnswerListCount"), questionId);
}
+
+ private int getFeedbackStaffListCount(FeedbackEntity query) {
+ return (Integer)this.getSqlSession().selectOne(this.getSqlId("getFeedbackStaffListCount"), query);
+ }
}
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/model/vo/FeedbackAnswerVo.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/model/vo/FeedbackAnswerVo.java
index 8b06a638afd179c0970216477653c7f10c763c65..df40f21b04f816c5c47bcca5c675410fcde5761e 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/model/vo/FeedbackAnswerVo.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/model/vo/FeedbackAnswerVo.java
@@ -15,5 +15,6 @@ import java.util.Date;
*/
@Data
public class FeedbackAnswerVo extends BaseEntityLong {
-
+ /** 闂鍐呭**/
+ private String questionContent;
}
\ No newline at end of file
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/model/vo/FeedbackVo.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/model/vo/FeedbackVo.java
index 42ce0c87c240fa5478ba7856bba7f11768a51d7f..f136166d98289f431b365b1b24565dcf6af56446 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/model/vo/FeedbackVo.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/model/vo/FeedbackVo.java
@@ -17,6 +17,10 @@ import java.util.Date;
public class FeedbackVo extends BaseEntityLong {
private List<Long> staffList;
-
+ /** 闂Id */
private Long questionId;
+ /** 鍙嶉Id */
+ private Long feedbackId;
+ /** 鍙嶉鐘舵€� */
+ private Integer backStatus;
}
\ No newline at end of file
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/model/vo/OptionSummaryVo.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/model/vo/OptionSummaryVo.java
index 71842ae593de244edaa15dc50391e1caed446ad3..a0decd0629493dc087b68c13eaff18b690579a95 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/model/vo/OptionSummaryVo.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/model/vo/OptionSummaryVo.java
@@ -2,6 +2,8 @@ package com.mortals.xhx.module.feedback.model.vo;
import lombok.Data;
+import java.util.List;
+
/**
* 闂嵎鍗曢€夊閫夊弽棣堢粺璁¤鍥�
*/
@@ -36,4 +38,6 @@ public class OptionSummaryVo {
* 閫夐」缁熻
*/
private Integer optionCount;
+
+ List<OptionSummaryVo> optionList;
}
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/service/FeedbackService.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/service/FeedbackService.java
index e62ae2bb08c826b2b99d82c2a0d39e3fbbb3d4e2..bfca792dbe06b6288ddd00822cb5d23ccfbe5fc7 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/service/FeedbackService.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/service/FeedbackService.java
@@ -25,10 +25,10 @@ public interface FeedbackService extends ICRUDService<FeedbackEntity,Long>{
/***
* 闂嵎鍙嶉浜哄憳鍒楄〃
- * @param feedbackId
+ * @param query
* @return
*/
- List<FeedbackStaffInfoVo> getFeedbackStaffList(Long feedbackId) throws AppException;
+ Result<FeedbackStaffInfoVo> getFeedbackStaffList(FeedbackEntity query,PageInfo pageInfo) throws AppException;
/**
* 闂嵎鍗曢€夊閫夊弽棣堢粺璁�
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/service/impl/FeedbackAnswerServiceImpl.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/service/impl/FeedbackAnswerServiceImpl.java
index 73743b3f3128a2b646896f2d590c058ea0419916..2ce78949202893b3b30daf023855d45cfbd24663 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/service/impl/FeedbackAnswerServiceImpl.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/service/impl/FeedbackAnswerServiceImpl.java
@@ -1,4 +1,8 @@
package com.mortals.xhx.module.feedback.service.impl;
+import com.mortals.framework.model.PageInfo;
+import com.mortals.xhx.module.feedback.model.FeedbackQuestionEntity;
+import com.mortals.xhx.module.feedback.service.FeedbackQuestionService;
+import org.apache.commons.collections4.CollectionUtils;
import org.springframework.stereotype.Service;
import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
import com.mortals.framework.exception.AppException;
@@ -27,6 +31,8 @@ import lombok.extern.slf4j.Slf4j;
public class FeedbackAnswerServiceImpl extends AbstractCRUDServiceImpl<FeedbackAnswerDao, FeedbackAnswerEntity, Long> implements FeedbackAnswerService {
@Autowired
private FeedbackAnswerOptionService feedbackAnswerOptionService;
+ @Autowired
+ private FeedbackQuestionService feedbackQuestionService;
@Override
protected void saveAfter(FeedbackAnswerEntity entity, Context context) throws AppException {
@@ -64,4 +70,17 @@ public class FeedbackAnswerServiceImpl extends AbstractCRUDServiceImpl<FeedbackA
feedbackAnswerOptionService.removeList(feedbackAnswerOptionlist,context);
super.removeAfter(ids, context, result);
}
+
+ @Override
+ protected void findAfter(FeedbackAnswerEntity params, PageInfo pageInfo, Context context, List<FeedbackAnswerEntity> list) throws AppException {
+ if(CollectionUtils.isNotEmpty(list)){
+ for(FeedbackAnswerEntity item:list){
+ FeedbackQuestionEntity questionEntity = feedbackQuestionService.get(item.getQuestionId());
+ if(questionEntity!=null){
+ item.setQuestionContent(questionEntity.getContent());
+ }
+ }
+ }
+ super.findAfter(params, pageInfo, context, list);
+ }
}
\ No newline at end of file
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/service/impl/FeedbackQuestionServiceImpl.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/service/impl/FeedbackQuestionServiceImpl.java
index 0d18fb223f9e4f1734915eca8da430ed257f1869..17d40ae50c00ddc8f956c1b6b694c027a7270deb 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/service/impl/FeedbackQuestionServiceImpl.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/service/impl/FeedbackQuestionServiceImpl.java
@@ -35,8 +35,8 @@ public class FeedbackQuestionServiceImpl extends AbstractCRUDServiceImpl<Feedbac
item.setQuestionId(entity.getId());
item.setCreateUserId(this.getContextUserId(context));
item.setCreateTime(new Date());
- feedbackOptionService.save(item);
}).count();
+ feedbackOptionService.save(entity.getFeedbackOptionList());
}
super.saveAfter(entity, context);
}
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/service/impl/FeedbackServiceImpl.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/service/impl/FeedbackServiceImpl.java
index b4951fbb14f72539859d9f49441cf94e23e6a609..2114f0f0706444cd7508ff3188ad1becc1890928 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/service/impl/FeedbackServiceImpl.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/service/impl/FeedbackServiceImpl.java
@@ -52,7 +52,9 @@ public class FeedbackServiceImpl extends AbstractCRUDServiceImpl<FeedbackDao, Fe
item.setCreateUserId(this.getContextUserId(context));
item.setCreateTime(new Date());
}).count();
- feedbackQuestionService.save(entity.getFeedbackQuestionList());
+ for(FeedbackQuestionEntity questionEntity:entity.getFeedbackQuestionList()) {
+ feedbackQuestionService.save(questionEntity);
+ }
}
if(!ObjectUtils.isEmpty(entity.getStaffList())){
List<FeedbackStaffEntity> staffEntityList = new ArrayList<>();
@@ -81,7 +83,9 @@ public class FeedbackServiceImpl extends AbstractCRUDServiceImpl<FeedbackDao, Fe
item.setUpdateUserId(this.getContextUserId(context));
item.setUpdateTime(new Date());
}).count();
- feedbackQuestionService.save(entity.getFeedbackQuestionList());
+ for(FeedbackQuestionEntity questionEntity:entity.getFeedbackQuestionList()) {
+ feedbackQuestionService.save(questionEntity);
+ }
}
if(!ObjectUtils.isEmpty(entity.getStaffList())){
Long[] feedbackStaffIds = feedbackStaffService.find(new FeedbackStaffQuery().feedbackId(entity.getId())).stream().map(FeedbackStaffEntity::getId).toArray(Long[]::new);
@@ -110,11 +114,14 @@ public class FeedbackServiceImpl extends AbstractCRUDServiceImpl<FeedbackDao, Fe
}
@Override
- public List<FeedbackStaffInfoVo> getFeedbackStaffList(Long feedbackId) throws AppException {
- if(feedbackId==null){
+ public Result<FeedbackStaffInfoVo> getFeedbackStaffList(FeedbackEntity query,PageInfo pageInfo) throws AppException {
+ if(query.getFeedbackId()==null){
throw new AppException("缁╂晥鍙嶉璁板綍Id涓嶈兘涓虹┖");
}
- return dao.getFeedbackStaffList(feedbackId);
+ if(pageInfo==null){
+ pageInfo = new PageInfo();
+ }
+ return dao.getFeedbackStaffList(query,pageInfo);
}
@Override
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/web/FeedbackController.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/web/FeedbackController.java
index c3d8febcb9a31684300354f47a9abb16d926eb40..c4942a0670f533ad8063fbb5592f117a80ec76f8 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/web/FeedbackController.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/web/FeedbackController.java
@@ -1,14 +1,16 @@
package com.mortals.xhx.module.feedback.web;
import com.mortals.framework.annotation.UnAuth;
import com.mortals.framework.common.Rest;
+import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.PageInfo;
import com.mortals.framework.model.Result;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService;
-import com.mortals.xhx.module.feedback.model.FeedbackAnswerEntity;
+import com.mortals.xhx.module.feedback.model.*;
import com.mortals.xhx.module.feedback.model.vo.FeedbackStaffInfoVo;
import com.mortals.xhx.module.feedback.model.vo.OptionSummaryVo;
import com.mortals.xhx.module.feedback.model.vo.QuestionAnswerVo;
+import com.mortals.xhx.module.feedback.service.FeedbackOptionService;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
@@ -19,16 +21,13 @@ import com.mortals.framework.model.Context;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
-import com.mortals.xhx.module.feedback.model.FeedbackEntity;
import com.mortals.xhx.module.feedback.service.FeedbackService;
import org.apache.commons.lang3.ArrayUtils;
import com.mortals.framework.util.StringUtils;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+
+import java.util.*;
import java.util.stream.Collectors;
import com.alibaba.fastjson.JSONObject;
-import java.util.Arrays;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import static com.mortals.framework.ap.SysConstains.*;
@@ -46,6 +45,9 @@ public class FeedbackController extends BaseCRUDJsonBodyMappingController<Feedba
@Autowired
private ParamService paramService;
+ @Autowired
+ private FeedbackOptionService feedbackOptionService;
+
public FeedbackController(){
super.setModuleDesc( "缁╂晥鍙嶉璁板綍淇℃伅");
}
@@ -61,14 +63,25 @@ public class FeedbackController extends BaseCRUDJsonBodyMappingController<Feedba
super.init(model, context);
}
+ @Override
+ protected int infoAfter(Long id, Map<String, Object> model, FeedbackEntity entity, Context context) throws AppException {
+ if(CollectionUtils.isNotEmpty(entity.getFeedbackQuestionList())){
+ for(FeedbackQuestionEntity item:entity.getFeedbackQuestionList()){
+ List<FeedbackOptionEntity> optionEntities = feedbackOptionService.find(new FeedbackOptionQuery().questionId(item.getId()));
+ item.setFeedbackOptionList(optionEntities);
+ }
+ }
+ return super.infoAfter(id, model, entity, context);
+ }
+
/**
* 鏌ヨ闂嵎鍙嶉浜哄憳鍒楄〃
- * @param feedbackId
+ * @param query
* @return
*/
- @RequestMapping(value = {"getStaffList"},method = {RequestMethod.POST, RequestMethod.GET})
+ @PostMapping({"getStaffList"})
@UnAuth
- public Rest<Object> getFeedbackStaffList(Long feedbackId) {
+ public Rest<Object> getFeedbackStaffList(@RequestBody FeedbackEntity query) {
Rest<Object> ret = new Rest();
Map<String, Object> model = new HashMap();
Context context = this.getContext();
@@ -76,9 +89,10 @@ public class FeedbackController extends BaseCRUDJsonBodyMappingController<Feedba
int code=1;
try {
- List<FeedbackStaffInfoVo> result = this.getService().getFeedbackStaffList(feedbackId);
- if(CollectionUtils.isNotEmpty(result)) {
- Map<Integer, List<FeedbackStaffInfoVo>> groupMap = result.stream().collect(Collectors.groupingBy(FeedbackStaffInfoVo::getBackStatus));
+ PageInfo pageInfo = this.buildPageInfo(query);
+ Result<FeedbackStaffInfoVo> result = this.getService().getFeedbackStaffList(query,pageInfo);
+ if(CollectionUtils.isNotEmpty(result.getList())) {
+ Map<Integer, List<FeedbackStaffInfoVo>> groupMap = result.getList().stream().collect(Collectors.groupingBy(FeedbackStaffInfoVo::getBackStatus));
if(groupMap.containsKey(1)) {
model.put("feedBack", groupMap.get(1).size());
}else {
@@ -93,8 +107,9 @@ public class FeedbackController extends BaseCRUDJsonBodyMappingController<Feedba
model.put("feedBack", 0);
model.put("notBack", 0);
}
- model.put("data", result);
- model.put("message_info", busiDesc + "鎴愬姛");
+ model.put("data", result.getList());
+ model.put("pageInfo", result.getPageInfo());
+ this.parsePageInfo(model, result.getPageInfo());
if (!ObjectUtils.isEmpty(context) && !ObjectUtils.isEmpty(context.getUser())) {
this.recordSysLog(this.request, busiDesc + " 銆愭垚鍔熴€�");
}
@@ -126,7 +141,21 @@ public class FeedbackController extends BaseCRUDJsonBodyMappingController<Feedba
int code=1;
try {
List<OptionSummaryVo> result = this.getService().getOptionSummaryList(feedbackId);
- model.put("data", result);
+ List<OptionSummaryVo> list = new ArrayList<>();
+ if(CollectionUtils.isNotEmpty(result)) {
+ Map<Long, List<OptionSummaryVo>> groupMap = result.stream().collect(Collectors.groupingBy(OptionSummaryVo::getQuestionId));
+ for (Long key : groupMap.keySet()) {
+ OptionSummaryVo vo = new OptionSummaryVo();
+ OptionSummaryVo temp = groupMap.get(key).get(0);
+ vo.setQuestionId(key);
+ vo.setQuestion(temp.getQuestion());
+ vo.setFeedbackId(temp.getFeedbackId());
+ vo.setQuestionType(temp.getQuestionType());
+ vo.setOptionList(groupMap.get(key));
+ list.add(vo);
+ }
+ }
+ model.put("data", list);
model.put("message_info", busiDesc + "鎴愬姛");
if (!ObjectUtils.isEmpty(context) && !ObjectUtils.isEmpty(context.getUser())) {
this.recordSysLog(this.request, busiDesc + " 銆愭垚鍔熴€�");
@@ -156,14 +185,13 @@ public class FeedbackController extends BaseCRUDJsonBodyMappingController<Feedba
Context context = this.getContext();
String busiDesc = "鏌ヨ闂嵎闂鍙嶉璇︽儏";
- int code=1;
+ int code = 1;
try {
PageInfo pageInfo = this.buildPageInfo(query);
Result<QuestionAnswerVo> result = this.getService().getQuestionAnswerList(query.getQuestionId(), pageInfo);
model.put("data", result.getList());
model.put("pageInfo", result.getPageInfo());
this.parsePageInfo(model, result.getPageInfo());
- code = this.doListAfter(query, (Map)model, context);
model.put("message_info", busiDesc + "鎴愬姛");
if (!ObjectUtils.isEmpty(context) && !ObjectUtils.isEmpty(context.getUser())) {
this.recordSysLog(this.request, busiDesc + " 銆愭垚鍔熴€�");
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/impl/PerformAttendRecordServiceImpl.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/impl/PerformAttendRecordServiceImpl.java
index ca37c1af2511908e4b4864c265af9f5d85e2a136..2c5d4840daf30f30943830dfce75275c0f1100d5 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/impl/PerformAttendRecordServiceImpl.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/impl/PerformAttendRecordServiceImpl.java
@@ -1,4 +1,5 @@
package com.mortals.xhx.module.perform.service.impl;
+
import com.mortals.xhx.common.code.CheckStatusEnum;
import com.mortals.xhx.common.code.SubMethodEnum;
import com.mortals.xhx.common.utils.BeanUtil;
@@ -18,12 +19,12 @@ import lombok.extern.slf4j.Slf4j;
import java.util.Date;
/**
-* PerformAttendRecordService
-* 鑰冨嫟缁╂晥璁板綍淇℃伅 service瀹炵幇
-*
-* @author zxfei
-* @date 2023-07-10
-*/
+ * PerformAttendRecordService
+ * 鑰冨嫟缁╂晥璁板綍淇℃伅 service瀹炵幇
+ *
+ * @author zxfei
+ * @date 2023-07-10
+ */
@Service("performAttendRecordService")
@Slf4j
public class PerformAttendRecordServiceImpl extends AbstractCRUDServiceImpl<PerformAttendRecordDao, PerformAttendRecordEntity, Long> implements PerformAttendRecordService {
@@ -35,28 +36,29 @@ public class PerformAttendRecordServiceImpl extends AbstractCRUDServiceImpl<Perf
protected void saveAfter(PerformAttendRecordEntity entity, Context context) throws AppException {
CheckAttendRecordEntity checkAttendRecordEntity = new CheckAttendRecordEntity();
checkAttendRecordEntity.initAttrValue();
- BeanUtils.copyProperties(entity,checkAttendRecordEntity, BeanUtil.getNullPropertyNames(entity));
+ BeanUtils.copyProperties(entity, checkAttendRecordEntity, BeanUtil.getNullPropertyNames(entity));
checkAttendRecordEntity.setId(null);
checkAttendRecordEntity.setRecordId(entity.getId());
- if(entity.getSubMethod()== SubMethodEnum.绯荤粺鑷姩.getValue()){
+ if (entity.getSubMethod() == SubMethodEnum.绯荤粺鑷姩.getValue()) {
checkAttendRecordEntity.setCheckStatus(CheckStatusEnum.宸插鐞�.getValue()); //鑷姩鎵ｅ垎鐩歌缃负宸插鐞�
- }else {
+ } else {
checkAttendRecordEntity.setCheckStatus(CheckStatusEnum.鏈鐞�.getValue()); //闈炶嚜鍔ㄦ墸鍒嗙浉璁剧疆涓烘湭澶勭悊
}
- checkAttendRecordService.save(checkAttendRecordEntity,context);
+ checkAttendRecordEntity.setCheckTime(new Date());
+ checkAttendRecordService.save(checkAttendRecordEntity, context);
}
@Override
public void updateProcessStatus(Long id, Integer status) throws AppException {
- if(id==null){
+ if (id == null) {
throw new AppException("鑰冨嫟缁╂晥璁板綍Id涓嶈兘涓虹┖");
}
PerformAttendRecordEntity entity = this.get(id);
- if(entity==null){
+ if (entity == null) {
throw new AppException("鏃犳晥鐨勮€冨嫟缁╂晥璁板綍Id");
}
- if(status==null){
- status=1; //澶勭悊鐘舵€�(1.鏈牳鏌�,2.宸叉牳鏌�)
+ if (status == null) {
+ status = 1; //澶勭悊鐘舵€�(1.鏈牳鏌�,2.宸叉牳鏌�)
}
PerformAttendRecordEntity update = new PerformAttendRecordEntity();
update.setId(id);
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/impl/PerformComplainRecordServiceImpl.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/impl/PerformComplainRecordServiceImpl.java
index 0e150804b2850255009f541e19406d9ed0cdf99c..71cc8b9575ece7abea17e13c44e6cb630dd73906 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/impl/PerformComplainRecordServiceImpl.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/impl/PerformComplainRecordServiceImpl.java
@@ -43,6 +43,7 @@ public class PerformComplainRecordServiceImpl extends AbstractCRUDServiceImpl<Pe
}else {
checkComplainRecordEntity.setCheckStatus(CheckStatusEnum.鏈鐞�.getValue()); //闈炶嚜鍔ㄦ墸鍒嗙浉璁剧疆涓烘湭澶勭悊
}
+ checkComplainRecordEntity.setCheckTime(new Date());
checkComplainRecordService.save(checkComplainRecordEntity,context);
}
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/impl/PerformEffectRecordServiceImpl.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/impl/PerformEffectRecordServiceImpl.java
index e59d0bc36eefee9f7fb7d1d2a39268f1d0f564f4..10010cdc1e2810b614c349515249891451e3f645 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/impl/PerformEffectRecordServiceImpl.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/impl/PerformEffectRecordServiceImpl.java
@@ -43,6 +43,7 @@ public class PerformEffectRecordServiceImpl extends AbstractCRUDServiceImpl<Perf
}else {
checkEffectRecordEntity.setCheckStatus(CheckStatusEnum.鏈鐞�.getValue()); //闈炶嚜鍔ㄦ墸鍒嗙浉璁剧疆涓烘湭澶勭悊
}
+ checkEffectRecordEntity.setCheckTime(new Date());
checkEffectRecordService.save(checkEffectRecordEntity,context);
}
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/impl/PerformGoworkRecordServiceImpl.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/impl/PerformGoworkRecordServiceImpl.java
index 32fb7fa493b7cfb6e65d1a6ab08cf56eb0cbdc50..39fbd72243d84a03de72266b01224d6cdcdc3694 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/impl/PerformGoworkRecordServiceImpl.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/impl/PerformGoworkRecordServiceImpl.java
@@ -43,6 +43,7 @@ public class PerformGoworkRecordServiceImpl extends AbstractCRUDServiceImpl<Perf
}else {
checkGoworkRecordEntity.setCheckStatus(CheckStatusEnum.鏈鐞�.getValue()); //闈炶嚜鍔ㄦ墸鍒嗙浉璁剧疆涓烘湭澶勭悊
}
+ checkGoworkRecordEntity.setCheckTime(new Date());
checkGoworkRecordService.save(checkGoworkRecordEntity,context);
}
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/impl/PerformOtherRecordServiceImpl.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/impl/PerformOtherRecordServiceImpl.java
index fe8750e1a652efda0526af0aa2977d453b313b9c..a67b50f1006100c839c36c0cde7f396fb068a84a 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/impl/PerformOtherRecordServiceImpl.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/impl/PerformOtherRecordServiceImpl.java
@@ -43,6 +43,7 @@ public class PerformOtherRecordServiceImpl extends AbstractCRUDServiceImpl<Perfo
}else {
checkOtherRecordEntity.setCheckStatus(CheckStatusEnum.鏈鐞�.getValue()); //闈炶嚜鍔ㄦ墸鍒嗙浉璁剧疆涓烘湭澶勭悊
}
+ checkOtherRecordEntity.setCheckTime(new Date());
checkOtherRecordService.save(checkOtherRecordEntity,context);
}
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/impl/PerformReviewRecordServiceImpl.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/impl/PerformReviewRecordServiceImpl.java
index ee6deb890bb14255f9f44db74f359c8c67215d2f..92c7ffcae2f7a62eae9de3a24abd5874036f238c 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/impl/PerformReviewRecordServiceImpl.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/impl/PerformReviewRecordServiceImpl.java
@@ -42,6 +42,9 @@ public class PerformReviewRecordServiceImpl extends AbstractCRUDServiceImpl<Perf
}else {
checkReviewRecordEntity.setCheckStatus(CheckStatusEnum.鏈鐞�.getValue()); //闈炶嚜鍔ㄦ墸鍒嗙浉璁剧疆涓烘湭澶勭悊
}
+
+ //checkReviewRecordEntity.s
+
checkReviewRecordService.save(checkReviewRecordEntity,context);
}
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformAttendAppealController.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformAttendAppealController.java
index 47023302c67bc62c670766ba6b27a85566db7c02..af51ab389080d5ad26935721246fa61b114b6402 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformAttendAppealController.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformAttendAppealController.java
@@ -2,12 +2,14 @@ package com.mortals.xhx.module.perform.web;
import com.mortals.framework.common.Rest;
import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.OrderCol;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.common.code.EnabledEnum;
import com.mortals.xhx.common.code.YesNoEnum;
import com.mortals.xhx.module.perform.model.vo.AppealInfo;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
@@ -66,6 +68,16 @@ public class PerformAttendAppealController extends BaseCRUDJsonBodyMappingContro
super.init(model, context);
}
+
+ @Override
+ protected void doListBefore(PerformAttendAppealEntity query, Map<String, Object> model, Context context) throws AppException {
+ if (ObjectUtils.isEmpty(query.getOrderColList())) {
+ query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
+ } else {
+ query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
+ }
+ }
+
/**
* 鐢宠瘔缁熻
*/
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformAttendRecordController.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformAttendRecordController.java
index a6ccc3b4f076a7ea65f19402c20748398cd928b7..306e2d60ab0ef0f4b73f110632308538676f6e6f 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformAttendRecordController.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformAttendRecordController.java
@@ -1,7 +1,11 @@
package com.mortals.xhx.module.perform.web;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.OrderCol;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.common.code.*;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
@@ -42,11 +46,22 @@ public class PerformAttendRecordController extends BaseCRUDJsonBodyMappingContro
@Override
protected void init(Map<String, Object> model, Context context) {
- this.addDict(model, "subMethod", paramService.getParamBySecondOrganize("PerformAttendRecord","subMethod"));
- this.addDict(model, "subAddType", paramService.getParamBySecondOrganize("PerformAttendRecord","subAddType"));
- this.addDict(model, "processStatus", paramService.getParamBySecondOrganize("PerformAttendRecord","processStatus"));
+ this.addDict(model, "processStatus", ProcessStatusEnum.getEnumMap());
+ this.addDict(model, "checkStatus", CheckStatusEnum.getEnumMap());
+ this.addDict(model, "subMethod", SubMethodEnum.getEnumMap());
+ this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
+ this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
+
super.init(model, context);
}
-
+ @Override
+ protected void doListBefore(PerformAttendRecordEntity query, Map<String, Object> model, Context context) throws AppException {
+ super.doListBefore(query, model, context);
+ if (ObjectUtils.isEmpty(query.getOrderColList())) {
+ query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
+ } else {
+ query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
+ }
+ }
}
\ No newline at end of file
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformComplainRecordController.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformComplainRecordController.java
index 551cfcb8fd75d5b17ca44e8b3a5d1eb5156484b7..e9c9a0807a3359b2d55b79af1e90a58bf94cabc9 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformComplainRecordController.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformComplainRecordController.java
@@ -1,6 +1,8 @@
package com.mortals.xhx.module.perform.web;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.common.code.*;
+import org.apache.tomcat.jni.Proc;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -42,9 +44,12 @@ public class PerformComplainRecordController extends BaseCRUDJsonBodyMappingCont
@Override
protected void init(Map<String, Object> model, Context context) {
- this.addDict(model, "subMethod", paramService.getParamBySecondOrganize("PerformComplainRecord","subMethod"));
- this.addDict(model, "processStatus", paramService.getParamBySecondOrganize("PerformComplainRecord","processStatus"));
- this.addDict(model, "subAddType", paramService.getParamBySecondOrganize("PerformComplainRecord","subAddType"));
+ this.addDict(model, "processStatus", ProcessStatusEnum.getEnumMap());
+ this.addDict(model, "checkStatus", CheckStatusEnum.getEnumMap());
+ this.addDict(model, "subMethod", SubMethodEnum.getEnumMap());
+ this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
+ this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
+
super.init(model, context);
}
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformEffectRecordController.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformEffectRecordController.java
index 71368766706f3835e07e1de499766db18c537260..a2a43d9fcf33021de5649bc59496b99e72596f68 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformEffectRecordController.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformEffectRecordController.java
@@ -1,7 +1,11 @@
package com.mortals.xhx.module.perform.web;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.OrderCol;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.common.code.*;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
@@ -43,11 +47,21 @@ public class PerformEffectRecordController extends BaseCRUDJsonBodyMappingContro
@Override
protected void init(Map<String, Object> model, Context context) {
this.addDict(model, "irregularType", paramService.getParamBySecondOrganize("PerformEffectRecord","irregularType"));
- this.addDict(model, "subMethod", paramService.getParamBySecondOrganize("PerformEffectRecord","subMethod"));
- this.addDict(model, "processStatus", paramService.getParamBySecondOrganize("PerformEffectRecord","processStatus"));
- this.addDict(model, "subAddType", paramService.getParamBySecondOrganize("PerformEffectRecord","subAddType"));
+ this.addDict(model, "processStatus", ProcessStatusEnum.getEnumMap());
+ this.addDict(model, "checkStatus", CheckStatusEnum.getEnumMap());
+ this.addDict(model, "subMethod", SubMethodEnum.getEnumMap());
+ this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
+ this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
+
super.init(model, context);
}
-
+ @Override
+ protected void doListBefore(PerformEffectRecordEntity query, Map<String, Object> model, Context context) throws AppException {
+ if (ObjectUtils.isEmpty(query.getOrderColList())) {
+ query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
+ } else {
+ query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
+ }
+ }
}
\ No newline at end of file
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformGoworkRecordController.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformGoworkRecordController.java
index 09a522d33e92de16301ed59821b8330b7cdb2604..fd593579582e43e24ac552e34583d28c48cc4110 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformGoworkRecordController.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformGoworkRecordController.java
@@ -1,7 +1,11 @@
package com.mortals.xhx.module.perform.web;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.OrderCol;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.common.code.*;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
@@ -42,11 +46,22 @@ public class PerformGoworkRecordController extends BaseCRUDJsonBodyMappingContro
@Override
protected void init(Map<String, Object> model, Context context) {
- this.addDict(model, "subMethod", paramService.getParamBySecondOrganize("PerformGoworkRecord","subMethod"));
- this.addDict(model, "processStatus", paramService.getParamBySecondOrganize("PerformGoworkRecord","processStatus"));
- this.addDict(model, "subAddType", paramService.getParamBySecondOrganize("PerformGoworkRecord","subAddType"));
+ this.addDict(model, "processStatus", ProcessStatusEnum.getEnumMap());
+ this.addDict(model, "checkStatus", CheckStatusEnum.getEnumMap());
+ this.addDict(model, "subMethod", SubMethodEnum.getEnumMap());
+ this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
+ this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
+
+
super.init(model, context);
}
-
+ @Override
+ protected void doListBefore(PerformGoworkRecordEntity query, Map<String, Object> model, Context context) throws AppException {
+ if (ObjectUtils.isEmpty(query.getOrderColList())) {
+ query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
+ } else {
+ query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
+ }
+ }
}
\ No newline at end of file
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformOtherRecordController.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformOtherRecordController.java
index 62ca16f9f67bd4593b34a80e4101fa4e38d35ef5..97bdf3151c7672d949b2445985acd434aa821608 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformOtherRecordController.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformOtherRecordController.java
@@ -1,7 +1,11 @@
package com.mortals.xhx.module.perform.web;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.OrderCol;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.common.code.*;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
@@ -43,11 +47,22 @@ public class PerformOtherRecordController extends BaseCRUDJsonBodyMappingControl
@Override
protected void init(Map<String, Object> model, Context context) {
this.addDict(model, "irregularOtherType", paramService.getParamBySecondOrganize("PerformOtherRecord","irregularOtherType"));
- this.addDict(model, "subMethod", paramService.getParamBySecondOrganize("PerformOtherRecord","subMethod"));
- this.addDict(model, "processStatus", paramService.getParamBySecondOrganize("PerformOtherRecord","processStatus"));
- this.addDict(model, "subAddType", paramService.getParamBySecondOrganize("PerformOtherRecord","subAddType"));
+ this.addDict(model, "processStatus", ProcessStatusEnum.getEnumMap());
+ this.addDict(model, "checkStatus", CheckStatusEnum.getEnumMap());
+ this.addDict(model, "subMethod", SubMethodEnum.getEnumMap());
+ this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
+ this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
+
+
super.init(model, context);
}
-
+ @Override
+ protected void doListBefore(PerformOtherRecordEntity query, Map<String, Object> model, Context context) throws AppException {
+ if (ObjectUtils.isEmpty(query.getOrderColList())) {
+ query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
+ } else {
+ query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
+ }
+ }
}
\ No newline at end of file
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformReviewRecordController.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformReviewRecordController.java
index 66113269c07c6c6d813ded93c859ea8a970685ac..bb9322ae528170bbc43005505e1e9563686ca649 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformReviewRecordController.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformReviewRecordController.java
@@ -1,7 +1,11 @@
package com.mortals.xhx.module.perform.web;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.OrderCol;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.common.code.*;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
@@ -44,11 +48,21 @@ public class PerformReviewRecordController extends BaseCRUDJsonBodyMappingContro
protected void init(Map<String, Object> model, Context context) {
this.addDict(model, "reviewResult", paramService.getParamBySecondOrganize("PerformReviewRecord","reviewResult"));
this.addDict(model, "reviewSource", paramService.getParamBySecondOrganize("PerformReviewRecord","reviewSource"));
- this.addDict(model, "subMethod", paramService.getParamBySecondOrganize("PerformReviewRecord","subMethod"));
- this.addDict(model, "processStatus", paramService.getParamBySecondOrganize("PerformReviewRecord","processStatus"));
- this.addDict(model, "subAddType", paramService.getParamBySecondOrganize("PerformReviewRecord","subAddType"));
+ this.addDict(model, "processStatus", ProcessStatusEnum.getEnumMap());
+ this.addDict(model, "checkStatus", CheckStatusEnum.getEnumMap());
+ this.addDict(model, "subMethod", SubMethodEnum.getEnumMap());
+ this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
+ this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
+
super.init(model, context);
}
-
+ @Override
+ protected void doListBefore(PerformReviewRecordEntity query, Map<String, Object> model, Context context) throws AppException {
+ if (ObjectUtils.isEmpty(query.getOrderColList())) {
+ query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
+ } else {
+ query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
+ }
+ }
}
\ No newline at end of file
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/StaffPerformStatEntity.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/StaffPerformStatEntity.java
index 5b1640da94ed6ef9824eadf67ad6e8dbaefc7821..59016e2bd359844005a6ea8c8da07d16a12941e5 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/StaffPerformStatEntity.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/StaffPerformStatEntity.java
@@ -1,167 +1,174 @@
package com.mortals.xhx.module.staff.model;
+
import java.math.BigDecimal;
+import java.util.Date;
import java.util.List;
import java.util.ArrayList;
+
+import cn.hutool.core.date.DateUtil;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.staff.model.vo.StaffPerformStatVo;
import lombok.Data;
+
/**
-* 鍛樺伐缁╂晥缁熻瀹炰綋瀵硅薄
-*
-* @author zxfei
-* @date 2023-07-11
-*/
+ * 鍛樺伐缁╂晥缁熻瀹炰綋瀵硅薄
+ *
+ * @author zxfei
+ * @date 2023-07-13
+ */
@Data
public class StaffPerformStatEntity extends StaffPerformStatVo {
private static final long serialVersionUID = 1L;
/**
- * 閮ㄩ棬id鍙�
- */
- private Long deptId;
+ * 閮ㄩ棬id鍙�
+ */
+ private Long staffId;
/**
- * 閮ㄩ棬鍚嶇О
- */
- private String deptName;
+ * 閮ㄩ棬鍚嶇О
+ */
+ private String staffName;
/**
- * 鍛樺伐缁╂晥鎬诲垎鏁�
- */
+ * 鍛樺伐缁╂晥鎬诲垎鏁�
+ */
@Excel(name = "鍛樺伐缁╂晥鎬诲垎鏁�")
private BigDecimal totalScore;
/**
- * 澶囨敞
- */
- private String remark;
- /**
- * 骞�
- */
- private Integer year;
+ * 鍛樺伐缁╂晥鍔犲垎鎬诲垎鏁版眹鎬�
+ */
+ @Excel(name = "鍛樺伐缁╂晥鍔犲垎鎬诲垎鏁版眹鎬�")
+ private BigDecimal totalAddScore;
/**
- * 鏈�
- */
- private Integer month;
+ * 鍛樺伐缁╂晥鍑忓垎鎬诲垎鏁版眹鎬�
+ */
+ @Excel(name = "鍛樺伐缁╂晥鍑忓垎鎬诲垎鏁版眹鎬�")
+ private BigDecimal totalSubScore;
/**
- * 鑰冨嫟缁╂晥鎸囨爣澧炲姞鍒嗘暟
- */
+ * 鑰冨嫟缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ */
private BigDecimal attendScoreAdd;
/**
- * 鑰冨嫟缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- */
+ * 鑰冨嫟缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ */
private BigDecimal attendScoreSub;
/**
- * 璇勪环缁╂晥鎸囨爣澧炲姞鍒嗘暟
- */
+ * 璇勪环缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ */
private BigDecimal assessScoreAdd;
/**
- * 璇勪环缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- */
+ * 璇勪环缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ */
private BigDecimal assessScoreSub;
/**
- * 鍔炰欢缁╂晥鎸囨爣澧炲姞鍒嗘暟
- */
+ * 鎶曡瘔缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ */
+ private BigDecimal complainScoreAdd;
+ /**
+ * 鎶曡瘔缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ */
+ private BigDecimal complainScoreSub;
+ /**
+ * 鍔炰欢缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ */
private BigDecimal workScoreAdd;
/**
- * 鍔炰欢缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- */
+ * 鍔炰欢缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ */
private BigDecimal workScoreSub;
/**
- * 鏁堣兘缁╂晥鎸囨爣澧炲姞鍒嗘暟
- */
+ * 鏁堣兘缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ */
private BigDecimal effectScoreAdd;
/**
- * 鏁堣兘缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- */
+ * 鏁堣兘缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ */
private BigDecimal effectScoreSub;
/**
- * 鍏跺畠缁╂晥鎸囨爣澧炲姞鍒嗘暟
- */
+ * 鍏跺畠缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ */
private BigDecimal otherScoreAdd;
/**
- * 鍏跺畠缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- */
+ * 鍏跺畠缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ */
private BigDecimal otherScoreSub;
/**
- * 鏃�
- */
- private Integer day;
- /**
- * 鍛樺伐缁╂晥鍔犲垎鎬诲垎鏁版眹鎬�
- */
- @Excel(name = "鍛樺伐缁╂晥鍔犲垎鎬诲垎鏁版眹鎬�")
- private BigDecimal totalAddScore;
+ * 澶囨敞
+ */
+ private String remark;
/**
- * 鍛樺伐缁╂晥鍑忓垎鎬诲垎鏁版眹鎬�
- */
- @Excel(name = "鍛樺伐缁╂晥鍑忓垎鎬诲垎鏁版眹鎬�")
- private BigDecimal totalSubScore;
+ * 骞�
+ */
+ private Integer year;
/**
- * 鎶曡瘔缁╂晥鎸囨爣澧炲姞鍒嗘暟
- */
- private BigDecimal complainScoreAdd;
+ * 鏈�
+ */
+ private Integer month;
/**
- * 鎶曡瘔缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- */
- private BigDecimal complainScoreSub;
+ * 鏃�
+ */
+ private Integer day;
+
@Override
public int hashCode() {
- return this.getId().hashCode();
+ return this.getId().hashCode();
}
+
@Override
public boolean equals(Object obj) {
if (obj == null) return false;
if (obj instanceof StaffPerformStatEntity) {
StaffPerformStatEntity tmp = (StaffPerformStatEntity) obj;
if (this.getId() == tmp.getId()) {
- return true;
+ return true;
}
}
return false;
}
- public void initAttrValue(){
+ public void initAttrValue() {
- this.deptId = 0L;
+ this.staffId = 0L;
- this.deptName = "";
+ this.staffName = "";
- this.totalScore = new BigDecimal(0);
+ this.totalScore = new BigDecimal(0);
- this.remark = "";
+ this.totalAddScore = new BigDecimal(0);
- this.year = -1;
+ this.totalSubScore = new BigDecimal(0);
- this.month = -1;
+ this.attendScoreAdd = new BigDecimal(0);
- this.attendScoreAdd = new BigDecimal(0);
+ this.attendScoreSub = new BigDecimal(0);
- this.attendScoreSub = new BigDecimal(0);
+ this.assessScoreAdd = new BigDecimal(0);
- this.assessScoreAdd = new BigDecimal(0);
+ this.assessScoreSub = new BigDecimal(0);
- this.assessScoreSub = new BigDecimal(0);
+ this.complainScoreAdd = new BigDecimal(0);
- this.workScoreAdd = new BigDecimal(0);
+ this.complainScoreSub = new BigDecimal(0);
- this.workScoreSub = new BigDecimal(0);
+ this.workScoreAdd = new BigDecimal(0);
- this.effectScoreAdd = new BigDecimal(0);
+ this.workScoreSub = new BigDecimal(0);
- this.effectScoreSub = new BigDecimal(0);
+ this.effectScoreAdd = new BigDecimal(0);
- this.otherScoreAdd = new BigDecimal(0);
+ this.effectScoreSub = new BigDecimal(0);
- this.otherScoreSub = new BigDecimal(0);
+ this.otherScoreAdd = new BigDecimal(0);
- this.day = -1;
+ this.otherScoreSub = new BigDecimal(0);
- this.totalAddScore = new BigDecimal(0);
+ this.remark = "";
- this.totalSubScore = new BigDecimal(0);
+ this.year = DateUtil.year(new Date());
- this.complainScoreAdd = new BigDecimal(0);
+ this.month = DateUtil.month(new Date()) + 1;
- this.complainScoreSub = new BigDecimal(0);
+ this.day = DateUtil.dayOfMonth(new Date());
}
}
\ No newline at end of file
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/StaffPerformStatQuery.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/StaffPerformStatQuery.java
index 498ef3e32da18e16e9738fd86cde069c52f0fe61..8c3981404f487bfb0acb4f76eb7004b52e4a0473 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/StaffPerformStatQuery.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/StaffPerformStatQuery.java
@@ -4,11 +4,11 @@ import java.math.BigDecimal;
import java.util.List;
import com.mortals.xhx.module.staff.model.StaffPerformStatEntity;
/**
-* 鍛樺伐缁╂晥缁熻鏌ヨ瀵硅薄
-*
-* @author zxfei
-* @date 2023-07-11
-*/
+ * 鍛樺伐缁╂晥缁熻鏌ヨ瀵硅薄
+ *
+ * @author zxfei
+ * @date 2023-07-13
+ */
public class StaffPerformStatQuery extends StaffPerformStatEntity {
/** 寮€濮� 涓婚敭ID锛屼富閿紝鑷闀� */
private Long idStart;
@@ -26,25 +26,25 @@ public class StaffPerformStatQuery extends StaffPerformStatEntity {
private List <Long> idNotList;
/** 寮€濮� 閮ㄩ棬id鍙� */
- private Long deptIdStart;
+ private Long staffIdStart;
/** 缁撴潫 閮ㄩ棬id鍙� */
- private Long deptIdEnd;
+ private Long staffIdEnd;
/** 澧炲姞 閮ㄩ棬id鍙� */
- private Long deptIdIncrement;
+ private Long staffIdIncrement;
/** 閮ㄩ棬id鍙峰垪琛� */
- private List <Long> deptIdList;
+ private List <Long> staffIdList;
/** 閮ㄩ棬id鍙锋帓闄ゅ垪琛� */
- private List <Long> deptIdNotList;
+ private List <Long> staffIdNotList;
/** 閮ㄩ棬鍚嶇О */
- private List<String> deptNameList;
+ private List<String> staffNameList;
/** 閮ㄩ棬鍚嶇О鎺掗櫎鍒楄〃 */
- private List <String> deptNameNotList;
+ private List <String> staffNameNotList;
/** 寮€濮� 鍛樺伐缁╂晥鎬诲垎鏁� */
private BigDecimal totalScoreStart;
@@ -60,82 +60,35 @@ public class StaffPerformStatQuery extends StaffPerformStatEntity {
/** 鍛樺伐缁╂晥鎬诲垎鏁版帓闄ゅ垪琛� */
private List <BigDecimal> totalScoreNotList;
- /** 澶囨敞 */
- private List<String> remarkList;
-
- /** 澶囨敞鎺掗櫎鍒楄〃 */
- private List <String> remarkNotList;
- /** 寮€濮� 骞� */
- private Integer yearStart;
-
- /** 缁撴潫 骞� */
- private Integer yearEnd;
-
- /** 澧炲姞 骞� */
- private Integer yearIncrement;
-
- /** 骞村垪琛� */
- private List <Integer> yearList;
-
- /** 骞存帓闄ゅ垪琛� */
- private List <Integer> yearNotList;
-
- /** 寮€濮� 鏈� */
- private Integer monthStart;
-
- /** 缁撴潫 鏈� */
- private Integer monthEnd;
-
- /** 澧炲姞 鏈� */
- private Integer monthIncrement;
-
- /** 鏈堝垪琛� */
- private List <Integer> monthList;
-
- /** 鏈堟帓闄ゅ垪琛� */
- private List <Integer> monthNotList;
-
- /** 寮€濮� 鍒涘缓鏃堕棿 */
- private String createTimeStart;
-
- /** 缁撴潫 鍒涘缓鏃堕棿 */
- private String createTimeEnd;
-
- /** 寮€濮� 鍒涘缓浜篿d */
- private Long createUserIdStart;
-
- /** 缁撴潫 鍒涘缓浜篿d */
- private Long createUserIdEnd;
-
- /** 澧炲姞 鍒涘缓浜篿d */
- private Long createUserIdIncrement;
+ /** 寮€濮� 鍛樺伐缁╂晥鍔犲垎鎬诲垎鏁版眹鎬� */
+ private BigDecimal totalAddScoreStart;
- /** 鍒涘缓浜篿d鍒楄〃 */
- private List <Long> createUserIdList;
+ /** 缁撴潫 鍛樺伐缁╂晥鍔犲垎鎬诲垎鏁版眹鎬� */
+ private BigDecimal totalAddScoreEnd;
- /** 鍒涘缓浜篿d鎺掗櫎鍒楄〃 */
- private List <Long> createUserIdNotList;
+ /** 澧炲姞 鍛樺伐缁╂晥鍔犲垎鎬诲垎鏁版眹鎬� */
+ private BigDecimal totalAddScoreIncrement;
- /** 寮€濮� 鏇存柊鏃堕棿 */
- private String updateTimeStart;
+ /** 鍛樺伐缁╂晥鍔犲垎鎬诲垎鏁版眹鎬诲垪琛� */
+ private List <BigDecimal> totalAddScoreList;
- /** 缁撴潫 鏇存柊鏃堕棿 */
- private String updateTimeEnd;
+ /** 鍛樺伐缁╂晥鍔犲垎鎬诲垎鏁版眹鎬绘帓闄ゅ垪琛� */
+ private List <BigDecimal> totalAddScoreNotList;
- /** 寮€濮� 鏇存柊浜篿d */
- private Long updateUserIdStart;
+ /** 寮€濮� 鍛樺伐缁╂晥鍑忓垎鎬诲垎鏁版眹鎬� */
+ private BigDecimal totalSubScoreStart;
- /** 缁撴潫 鏇存柊浜篿d */
- private Long updateUserIdEnd;
+ /** 缁撴潫 鍛樺伐缁╂晥鍑忓垎鎬诲垎鏁版眹鎬� */
+ private BigDecimal totalSubScoreEnd;
- /** 澧炲姞 鏇存柊浜篿d */
- private Long updateUserIdIncrement;
+ /** 澧炲姞 鍛樺伐缁╂晥鍑忓垎鎬诲垎鏁版眹鎬� */
+ private BigDecimal totalSubScoreIncrement;
- /** 鏇存柊浜篿d鍒楄〃 */
- private List <Long> updateUserIdList;
+ /** 鍛樺伐缁╂晥鍑忓垎鎬诲垎鏁版眹鎬诲垪琛� */
+ private List <BigDecimal> totalSubScoreList;
- /** 鏇存柊浜篿d鎺掗櫎鍒楄〃 */
- private List <Long> updateUserIdNotList;
+ /** 鍛樺伐缁╂晥鍑忓垎鎬诲垎鏁版眹鎬绘帓闄ゅ垪琛� */
+ private List <BigDecimal> totalSubScoreNotList;
/** 寮€濮� 鑰冨嫟缁╂晥鎸囨爣澧炲姞鍒嗘暟 */
private BigDecimal attendScoreAddStart;
@@ -197,6 +150,36 @@ public class StaffPerformStatQuery extends StaffPerformStatEntity {
/** 璇勪环缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟鎺掗櫎鍒楄〃 */
private List <BigDecimal> assessScoreSubNotList;
+ /** 寮€濮� 鎶曡瘔缁╂晥鎸囨爣澧炲姞鍒嗘暟 */
+ private BigDecimal complainScoreAddStart;
+
+ /** 缁撴潫 鎶曡瘔缁╂晥鎸囨爣澧炲姞鍒嗘暟 */
+ private BigDecimal complainScoreAddEnd;
+
+ /** 澧炲姞 鎶曡瘔缁╂晥鎸囨爣澧炲姞鍒嗘暟 */
+ private BigDecimal complainScoreAddIncrement;
+
+ /** 鎶曡瘔缁╂晥鎸囨爣澧炲姞鍒嗘暟鍒楄〃 */
+ private List <BigDecimal> complainScoreAddList;
+
+ /** 鎶曡瘔缁╂晥鎸囨爣澧炲姞鍒嗘暟鎺掗櫎鍒楄〃 */
+ private List <BigDecimal> complainScoreAddNotList;
+
+ /** 寮€濮� 鎶曡瘔缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟 */
+ private BigDecimal complainScoreSubStart;
+
+ /** 缁撴潫 鎶曡瘔缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟 */
+ private BigDecimal complainScoreSubEnd;
+
+ /** 澧炲姞 鎶曡瘔缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟 */
+ private BigDecimal complainScoreSubIncrement;
+
+ /** 鎶曡瘔缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟鍒楄〃 */
+ private List <BigDecimal> complainScoreSubList;
+
+ /** 鎶曡瘔缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟鎺掗櫎鍒楄〃 */
+ private List <BigDecimal> complainScoreSubNotList;
+
/** 寮€濮� 鍔炰欢缁╂晥鎸囨爣澧炲姞鍒嗘暟 */
private BigDecimal workScoreAddStart;
@@ -287,6 +270,41 @@ public class StaffPerformStatQuery extends StaffPerformStatEntity {
/** 鍏跺畠缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟鎺掗櫎鍒楄〃 */
private List <BigDecimal> otherScoreSubNotList;
+ /** 澶囨敞 */
+ private List<String> remarkList;
+
+ /** 澶囨敞鎺掗櫎鍒楄〃 */
+ private List <String> remarkNotList;
+ /** 寮€濮� 骞� */
+ private Integer yearStart;
+
+ /** 缁撴潫 骞� */
+ private Integer yearEnd;
+
+ /** 澧炲姞 骞� */
+ private Integer yearIncrement;
+
+ /** 骞村垪琛� */
+ private List <Integer> yearList;
+
+ /** 骞存帓闄ゅ垪琛� */
+ private List <Integer> yearNotList;
+
+ /** 寮€濮� 鏈� */
+ private Integer monthStart;
+
+ /** 缁撴潫 鏈� */
+ private Integer monthEnd;
+
+ /** 澧炲姞 鏈� */
+ private Integer monthIncrement;
+
+ /** 鏈堝垪琛� */
+ private List <Integer> monthList;
+
+ /** 鏈堟帓闄ゅ垪琛� */
+ private List <Integer> monthNotList;
+
/** 寮€濮� 鏃� */
private Integer dayStart;
@@ -302,65 +320,47 @@ public class StaffPerformStatQuery extends StaffPerformStatEntity {
/** 鏃ユ帓闄ゅ垪琛� */
private List <Integer> dayNotList;
- /** 寮€濮� 鍛樺伐缁╂晥鍔犲垎鎬诲垎鏁版眹鎬� */
- private BigDecimal totalAddScoreStart;
-
- /** 缁撴潫 鍛樺伐缁╂晥鍔犲垎鎬诲垎鏁版眹鎬� */
- private BigDecimal totalAddScoreEnd;
-
- /** 澧炲姞 鍛樺伐缁╂晥鍔犲垎鎬诲垎鏁版眹鎬� */
- private BigDecimal totalAddScoreIncrement;
-
- /** 鍛樺伐缁╂晥鍔犲垎鎬诲垎鏁版眹鎬诲垪琛� */
- private List <BigDecimal> totalAddScoreList;
-
- /** 鍛樺伐缁╂晥鍔犲垎鎬诲垎鏁版眹鎬绘帓闄ゅ垪琛� */
- private List <BigDecimal> totalAddScoreNotList;
-
- /** 寮€濮� 鍛樺伐缁╂晥鍑忓垎鎬诲垎鏁版眹鎬� */
- private BigDecimal totalSubScoreStart;
-
- /** 缁撴潫 鍛樺伐缁╂晥鍑忓垎鎬诲垎鏁版眹鎬� */
- private BigDecimal totalSubScoreEnd;
+ /** 寮€濮� 鍒涘缓鏃堕棿 */
+ private String createTimeStart;
- /** 澧炲姞 鍛樺伐缁╂晥鍑忓垎鎬诲垎鏁版眹鎬� */
- private BigDecimal totalSubScoreIncrement;
+ /** 缁撴潫 鍒涘缓鏃堕棿 */
+ private String createTimeEnd;
- /** 鍛樺伐缁╂晥鍑忓垎鎬诲垎鏁版眹鎬诲垪琛� */
- private List <BigDecimal> totalSubScoreList;
+ /** 寮€濮� 鍒涘缓浜篿d */
+ private Long createUserIdStart;
- /** 鍛樺伐缁╂晥鍑忓垎鎬诲垎鏁版眹鎬绘帓闄ゅ垪琛� */
- private List <BigDecimal> totalSubScoreNotList;
+ /** 缁撴潫 鍒涘缓浜篿d */
+ private Long createUserIdEnd;
- /** 寮€濮� 鎶曡瘔缁╂晥鎸囨爣澧炲姞鍒嗘暟 */
- private BigDecimal complainScoreAddStart;
+ /** 澧炲姞 鍒涘缓浜篿d */
+ private Long createUserIdIncrement;
- /** 缁撴潫 鎶曡瘔缁╂晥鎸囨爣澧炲姞鍒嗘暟 */
- private BigDecimal complainScoreAddEnd;
+ /** 鍒涘缓浜篿d鍒楄〃 */
+ private List <Long> createUserIdList;
- /** 澧炲姞 鎶曡瘔缁╂晥鎸囨爣澧炲姞鍒嗘暟 */
- private BigDecimal complainScoreAddIncrement;
+ /** 鍒涘缓浜篿d鎺掗櫎鍒楄〃 */
+ private List <Long> createUserIdNotList;
- /** 鎶曡瘔缁╂晥鎸囨爣澧炲姞鍒嗘暟鍒楄〃 */
- private List <BigDecimal> complainScoreAddList;
+ /** 寮€濮� 鏇存柊鏃堕棿 */
+ private String updateTimeStart;
- /** 鎶曡瘔缁╂晥鎸囨爣澧炲姞鍒嗘暟鎺掗櫎鍒楄〃 */
- private List <BigDecimal> complainScoreAddNotList;
+ /** 缁撴潫 鏇存柊鏃堕棿 */
+ private String updateTimeEnd;
- /** 寮€濮� 鎶曡瘔缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟 */
- private BigDecimal complainScoreSubStart;
+ /** 寮€濮� 鏇存柊浜篿d */
+ private Long updateUserIdStart;
- /** 缁撴潫 鎶曡瘔缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟 */
- private BigDecimal complainScoreSubEnd;
+ /** 缁撴潫 鏇存柊浜篿d */
+ private Long updateUserIdEnd;
- /** 澧炲姞 鎶曡瘔缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟 */
- private BigDecimal complainScoreSubIncrement;
+ /** 澧炲姞 鏇存柊浜篿d */
+ private Long updateUserIdIncrement;
- /** 鎶曡瘔缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟鍒楄〃 */
- private List <BigDecimal> complainScoreSubList;
+ /** 鏇存柊浜篿d鍒楄〃 */
+ private List <Long> updateUserIdList;
- /** 鎶曡瘔缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟鎺掗櫎鍒楄〃 */
- private List <BigDecimal> complainScoreSubNotList;
+ /** 鏇存柊浜篿d鎺掗櫎鍒楄〃 */
+ private List <Long> updateUserIdNotList;
/** OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<StaffPerformStatQuery> orConditionList;
@@ -371,3171 +371,3171 @@ public class StaffPerformStatQuery extends StaffPerformStatEntity {
public StaffPerformStatQuery(){}
/**
- * 鑾峰彇 寮€濮� 涓婚敭ID锛屼富閿紝鑷闀�
- * @return idStart
- */
+ * 鑾峰彇 寮€濮� 涓婚敭ID锛屼富閿紝鑷闀�
+ * @return idStart
+ */
public Long getIdStart(){
return this.idStart;
}
/**
- * 璁剧疆 寮€濮� 涓婚敭ID锛屼富閿紝鑷闀�
- * @param idStart
- */
+ * 璁剧疆 寮€濮� 涓婚敭ID锛屼富閿紝鑷闀�
+ * @param idStart
+ */
public void setIdStart(Long idStart){
this.idStart = idStart;
}
/**
- * 鑾峰彇 缁撴潫 涓婚敭ID锛屼富閿紝鑷闀�
- * @return $idEnd
- */
+ * 鑾峰彇 缁撴潫 涓婚敭ID锛屼富閿紝鑷闀�
+ * @return $idEnd
+ */
public Long getIdEnd(){
return this.idEnd;
}
/**
- * 璁剧疆 缁撴潫 涓婚敭ID锛屼富閿紝鑷闀�
- * @param idEnd
- */
+ * 璁剧疆 缁撴潫 涓婚敭ID锛屼富閿紝鑷闀�
+ * @param idEnd
+ */
public void setIdEnd(Long idEnd){
this.idEnd = idEnd;
}
/**
- * 鑾峰彇 澧炲姞 涓婚敭ID锛屼富閿紝鑷闀�
- * @return idIncrement
- */
+ * 鑾峰彇 澧炲姞 涓婚敭ID锛屼富閿紝鑷闀�
+ * @return idIncrement
+ */
public Long getIdIncrement(){
return this.idIncrement;
}
/**
- * 璁剧疆 澧炲姞 涓婚敭ID锛屼富閿紝鑷闀�
- * @param idIncrement
- */
+ * 璁剧疆 澧炲姞 涓婚敭ID锛屼富閿紝鑷闀�
+ * @param idIncrement
+ */
public void setIdIncrement(Long idIncrement){
this.idIncrement = idIncrement;
}
/**
- * 鑾峰彇 涓婚敭ID锛屼富閿紝鑷闀�
- * @return idList
- */
+ * 鑾峰彇 涓婚敭ID锛屼富閿紝鑷闀�
+ * @return idList
+ */
public List<Long> getIdList(){
return this.idList;
}
/**
- * 璁剧疆 涓婚敭ID锛屼富閿紝鑷闀�
- * @param idList
- */
+ * 璁剧疆 涓婚敭ID锛屼富閿紝鑷闀�
+ * @param idList
+ */
public void setIdList(List<Long> idList){
this.idList = idList;
}
/**
- * 鑾峰彇 涓婚敭ID锛屼富閿紝鑷闀�
- * @return idNotList
- */
+ * 鑾峰彇 涓婚敭ID锛屼富閿紝鑷闀�
+ * @return idNotList
+ */
public List<Long> getIdNotList(){
return this.idNotList;
}
/**
- * 璁剧疆 涓婚敭ID锛屼富閿紝鑷闀�
- * @param idNotList
- */
+ * 璁剧疆 涓婚敭ID锛屼富閿紝鑷闀�
+ * @param idNotList
+ */
public void setIdNotList(List<Long> idNotList){
this.idNotList = idNotList;
}
/**
- * 鑾峰彇 寮€濮� 閮ㄩ棬id鍙�
- * @return deptIdStart
- */
- public Long getDeptIdStart(){
- return this.deptIdStart;
+ * 鑾峰彇 寮€濮� 閮ㄩ棬id鍙�
+ * @return staffIdStart
+ */
+ public Long getStaffIdStart(){
+ return this.staffIdStart;
}
/**
- * 璁剧疆 寮€濮� 閮ㄩ棬id鍙�
- * @param deptIdStart
- */
- public void setDeptIdStart(Long deptIdStart){
- this.deptIdStart = deptIdStart;
+ * 璁剧疆 寮€濮� 閮ㄩ棬id鍙�
+ * @param staffIdStart
+ */
+ public void setStaffIdStart(Long staffIdStart){
+ this.staffIdStart = staffIdStart;
}
/**
- * 鑾峰彇 缁撴潫 閮ㄩ棬id鍙�
- * @return $deptIdEnd
- */
- public Long getDeptIdEnd(){
- return this.deptIdEnd;
+ * 鑾峰彇 缁撴潫 閮ㄩ棬id鍙�
+ * @return $staffIdEnd
+ */
+ public Long getStaffIdEnd(){
+ return this.staffIdEnd;
}
/**
- * 璁剧疆 缁撴潫 閮ㄩ棬id鍙�
- * @param deptIdEnd
- */
- public void setDeptIdEnd(Long deptIdEnd){
- this.deptIdEnd = deptIdEnd;
+ * 璁剧疆 缁撴潫 閮ㄩ棬id鍙�
+ * @param staffIdEnd
+ */
+ public void setStaffIdEnd(Long staffIdEnd){
+ this.staffIdEnd = staffIdEnd;
}
/**
- * 鑾峰彇 澧炲姞 閮ㄩ棬id鍙�
- * @return deptIdIncrement
- */
- public Long getDeptIdIncrement(){
- return this.deptIdIncrement;
+ * 鑾峰彇 澧炲姞 閮ㄩ棬id鍙�
+ * @return staffIdIncrement
+ */
+ public Long getStaffIdIncrement(){
+ return this.staffIdIncrement;
}
/**
- * 璁剧疆 澧炲姞 閮ㄩ棬id鍙�
- * @param deptIdIncrement
- */
- public void setDeptIdIncrement(Long deptIdIncrement){
- this.deptIdIncrement = deptIdIncrement;
+ * 璁剧疆 澧炲姞 閮ㄩ棬id鍙�
+ * @param staffIdIncrement
+ */
+ public void setStaffIdIncrement(Long staffIdIncrement){
+ this.staffIdIncrement = staffIdIncrement;
}
/**
- * 鑾峰彇 閮ㄩ棬id鍙�
- * @return deptIdList
- */
- public List<Long> getDeptIdList(){
- return this.deptIdList;
+ * 鑾峰彇 閮ㄩ棬id鍙�
+ * @return staffIdList
+ */
+ public List<Long> getStaffIdList(){
+ return this.staffIdList;
}
/**
- * 璁剧疆 閮ㄩ棬id鍙�
- * @param deptIdList
- */
- public void setDeptIdList(List<Long> deptIdList){
- this.deptIdList = deptIdList;
+ * 璁剧疆 閮ㄩ棬id鍙�
+ * @param staffIdList
+ */
+ public void setStaffIdList(List<Long> staffIdList){
+ this.staffIdList = staffIdList;
}
/**
- * 鑾峰彇 閮ㄩ棬id鍙�
- * @return deptIdNotList
- */
- public List<Long> getDeptIdNotList(){
- return this.deptIdNotList;
+ * 鑾峰彇 閮ㄩ棬id鍙�
+ * @return staffIdNotList
+ */
+ public List<Long> getStaffIdNotList(){
+ return this.staffIdNotList;
}
/**
- * 璁剧疆 閮ㄩ棬id鍙�
- * @param deptIdNotList
- */
- public void setDeptIdNotList(List<Long> deptIdNotList){
- this.deptIdNotList = deptIdNotList;
+ * 璁剧疆 閮ㄩ棬id鍙�
+ * @param staffIdNotList
+ */
+ public void setStaffIdNotList(List<Long> staffIdNotList){
+ this.staffIdNotList = staffIdNotList;
}
/**
- * 鑾峰彇 閮ㄩ棬鍚嶇О
- * @return deptNameList
- */
- public List<String> getDeptNameList(){
- return this.deptNameList;
+ * 鑾峰彇 閮ㄩ棬鍚嶇О
+ * @return staffNameList
+ */
+ public List<String> getStaffNameList(){
+ return this.staffNameList;
}
/**
- * 璁剧疆 閮ㄩ棬鍚嶇О
- * @param deptNameList
- */
- public void setDeptNameList(List<String> deptNameList){
- this.deptNameList = deptNameList;
+ * 璁剧疆 閮ㄩ棬鍚嶇О
+ * @param staffNameList
+ */
+ public void setStaffNameList(List<String> staffNameList){
+ this.staffNameList = staffNameList;
}
/**
- * 鑾峰彇 閮ㄩ棬鍚嶇О
- * @return deptNameNotList
- */
- public List<String> getDeptNameNotList(){
- return this.deptNameNotList;
+ * 鑾峰彇 閮ㄩ棬鍚嶇О
+ * @return staffNameNotList
+ */
+ public List<String> getStaffNameNotList(){
+ return this.staffNameNotList;
}
/**
- * 璁剧疆 閮ㄩ棬鍚嶇О
- * @param deptNameNotList
- */
- public void setDeptNameNotList(List<String> deptNameNotList){
- this.deptNameNotList = deptNameNotList;
+ * 璁剧疆 閮ㄩ棬鍚嶇О
+ * @param staffNameNotList
+ */
+ public void setStaffNameNotList(List<String> staffNameNotList){
+ this.staffNameNotList = staffNameNotList;
}
/**
- * 鑾峰彇 寮€濮� 鍛樺伐缁╂晥鎬诲垎鏁�
- * @return totalScoreStart
- */
+ * 鑾峰彇 寮€濮� 鍛樺伐缁╂晥鎬诲垎鏁�
+ * @return totalScoreStart
+ */
public BigDecimal getTotalScoreStart(){
return this.totalScoreStart;
}
/**
- * 璁剧疆 寮€濮� 鍛樺伐缁╂晥鎬诲垎鏁�
- * @param totalScoreStart
- */
+ * 璁剧疆 寮€濮� 鍛樺伐缁╂晥鎬诲垎鏁�
+ * @param totalScoreStart
+ */
public void setTotalScoreStart(BigDecimal totalScoreStart){
this.totalScoreStart = totalScoreStart;
}
/**
- * 鑾峰彇 缁撴潫 鍛樺伐缁╂晥鎬诲垎鏁�
- * @return $totalScoreEnd
- */
+ * 鑾峰彇 缁撴潫 鍛樺伐缁╂晥鎬诲垎鏁�
+ * @return $totalScoreEnd
+ */
public BigDecimal getTotalScoreEnd(){
return this.totalScoreEnd;
}
/**
- * 璁剧疆 缁撴潫 鍛樺伐缁╂晥鎬诲垎鏁�
- * @param totalScoreEnd
- */
+ * 璁剧疆 缁撴潫 鍛樺伐缁╂晥鎬诲垎鏁�
+ * @param totalScoreEnd
+ */
public void setTotalScoreEnd(BigDecimal totalScoreEnd){
this.totalScoreEnd = totalScoreEnd;
}
/**
- * 鑾峰彇 澧炲姞 鍛樺伐缁╂晥鎬诲垎鏁�
- * @return totalScoreIncrement
- */
+ * 鑾峰彇 澧炲姞 鍛樺伐缁╂晥鎬诲垎鏁�
+ * @return totalScoreIncrement
+ */
public BigDecimal getTotalScoreIncrement(){
return this.totalScoreIncrement;
}
/**
- * 璁剧疆 澧炲姞 鍛樺伐缁╂晥鎬诲垎鏁�
- * @param totalScoreIncrement
- */
+ * 璁剧疆 澧炲姞 鍛樺伐缁╂晥鎬诲垎鏁�
+ * @param totalScoreIncrement
+ */
public void setTotalScoreIncrement(BigDecimal totalScoreIncrement){
this.totalScoreIncrement = totalScoreIncrement;
}
/**
- * 鑾峰彇 鍛樺伐缁╂晥鎬诲垎鏁�
- * @return totalScoreList
- */
+ * 鑾峰彇 鍛樺伐缁╂晥鎬诲垎鏁�
+ * @return totalScoreList
+ */
public List<BigDecimal> getTotalScoreList(){
return this.totalScoreList;
}
/**
- * 璁剧疆 鍛樺伐缁╂晥鎬诲垎鏁�
- * @param totalScoreList
- */
+ * 璁剧疆 鍛樺伐缁╂晥鎬诲垎鏁�
+ * @param totalScoreList
+ */
public void setTotalScoreList(List<BigDecimal> totalScoreList){
this.totalScoreList = totalScoreList;
}
/**
- * 鑾峰彇 鍛樺伐缁╂晥鎬诲垎鏁�
- * @return totalScoreNotList
- */
+ * 鑾峰彇 鍛樺伐缁╂晥鎬诲垎鏁�
+ * @return totalScoreNotList
+ */
public List<BigDecimal> getTotalScoreNotList(){
return this.totalScoreNotList;
}
/**
- * 璁剧疆 鍛樺伐缁╂晥鎬诲垎鏁�
- * @param totalScoreNotList
- */
+ * 璁剧疆 鍛樺伐缁╂晥鎬诲垎鏁�
+ * @param totalScoreNotList
+ */
public void setTotalScoreNotList(List<BigDecimal> totalScoreNotList){
this.totalScoreNotList = totalScoreNotList;
}
/**
- * 鑾峰彇 澶囨敞
- * @return remarkList
- */
- public List<String> getRemarkList(){
- return this.remarkList;
+ * 鑾峰彇 寮€濮� 鍛樺伐缁╂晥鍔犲垎鎬诲垎鏁版眹鎬�
+ * @return totalAddScoreStart
+ */
+ public BigDecimal getTotalAddScoreStart(){
+ return this.totalAddScoreStart;
}
/**
- * 璁剧疆 澶囨敞
- * @param remarkList
- */
- public void setRemarkList(List<String> remarkList){
- this.remarkList = remarkList;
+ * 璁剧疆 寮€濮� 鍛樺伐缁╂晥鍔犲垎鎬诲垎鏁版眹鎬�
+ * @param totalAddScoreStart
+ */
+ public void setTotalAddScoreStart(BigDecimal totalAddScoreStart){
+ this.totalAddScoreStart = totalAddScoreStart;
}
/**
- * 鑾峰彇 澶囨敞
- * @return remarkNotList
- */
- public List<String> getRemarkNotList(){
- return this.remarkNotList;
+ * 鑾峰彇 缁撴潫 鍛樺伐缁╂晥鍔犲垎鎬诲垎鏁版眹鎬�
+ * @return $totalAddScoreEnd
+ */
+ public BigDecimal getTotalAddScoreEnd(){
+ return this.totalAddScoreEnd;
}
/**
- * 璁剧疆 澶囨敞
- * @param remarkNotList
- */
- public void setRemarkNotList(List<String> remarkNotList){
- this.remarkNotList = remarkNotList;
+ * 璁剧疆 缁撴潫 鍛樺伐缁╂晥鍔犲垎鎬诲垎鏁版眹鎬�
+ * @param totalAddScoreEnd
+ */
+ public void setTotalAddScoreEnd(BigDecimal totalAddScoreEnd){
+ this.totalAddScoreEnd = totalAddScoreEnd;
}
/**
- * 鑾峰彇 寮€濮� 骞�
- * @return yearStart
- */
- public Integer getYearStart(){
- return this.yearStart;
+ * 鑾峰彇 澧炲姞 鍛樺伐缁╂晥鍔犲垎鎬诲垎鏁版眹鎬�
+ * @return totalAddScoreIncrement
+ */
+ public BigDecimal getTotalAddScoreIncrement(){
+ return this.totalAddScoreIncrement;
}
/**
- * 璁剧疆 寮€濮� 骞�
- * @param yearStart
- */
- public void setYearStart(Integer yearStart){
- this.yearStart = yearStart;
+ * 璁剧疆 澧炲姞 鍛樺伐缁╂晥鍔犲垎鎬诲垎鏁版眹鎬�
+ * @param totalAddScoreIncrement
+ */
+ public void setTotalAddScoreIncrement(BigDecimal totalAddScoreIncrement){
+ this.totalAddScoreIncrement = totalAddScoreIncrement;
}
/**
- * 鑾峰彇 缁撴潫 骞�
- * @return $yearEnd
- */
- public Integer getYearEnd(){
- return this.yearEnd;
+ * 鑾峰彇 鍛樺伐缁╂晥鍔犲垎鎬诲垎鏁版眹鎬�
+ * @return totalAddScoreList
+ */
+ public List<BigDecimal> getTotalAddScoreList(){
+ return this.totalAddScoreList;
}
/**
- * 璁剧疆 缁撴潫 骞�
- * @param yearEnd
- */
- public void setYearEnd(Integer yearEnd){
- this.yearEnd = yearEnd;
- }
-
- /**
- * 鑾峰彇 澧炲姞 骞�
- * @return yearIncrement
- */
- public Integer getYearIncrement(){
- return this.yearIncrement;
- }
-
- /**
- * 璁剧疆 澧炲姞 骞�
- * @param yearIncrement
- */
- public void setYearIncrement(Integer yearIncrement){
- this.yearIncrement = yearIncrement;
- }
-
- /**
- * 鑾峰彇 骞�
- * @return yearList
- */
- public List<Integer> getYearList(){
- return this.yearList;
- }
-
- /**
- * 璁剧疆 骞�
- * @param yearList
- */
- public void setYearList(List<Integer> yearList){
- this.yearList = yearList;
- }
-
- /**
- * 鑾峰彇 骞�
- * @return yearNotList
- */
- public List<Integer> getYearNotList(){
- return this.yearNotList;
- }
-
- /**
- * 璁剧疆 骞�
- * @param yearNotList
- */
- public void setYearNotList(List<Integer> yearNotList){
- this.yearNotList = yearNotList;
- }
-
-
- /**
- * 鑾峰彇 寮€濮� 鏈�
- * @return monthStart
- */
- public Integer getMonthStart(){
- return this.monthStart;
- }
-
- /**
- * 璁剧疆 寮€濮� 鏈�
- * @param monthStart
- */
- public void setMonthStart(Integer monthStart){
- this.monthStart = monthStart;
- }
-
- /**
- * 鑾峰彇 缁撴潫 鏈�
- * @return $monthEnd
- */
- public Integer getMonthEnd(){
- return this.monthEnd;
- }
-
- /**
- * 璁剧疆 缁撴潫 鏈�
- * @param monthEnd
- */
- public void setMonthEnd(Integer monthEnd){
- this.monthEnd = monthEnd;
- }
-
- /**
- * 鑾峰彇 澧炲姞 鏈�
- * @return monthIncrement
- */
- public Integer getMonthIncrement(){
- return this.monthIncrement;
- }
-
- /**
- * 璁剧疆 澧炲姞 鏈�
- * @param monthIncrement
- */
- public void setMonthIncrement(Integer monthIncrement){
- this.monthIncrement = monthIncrement;
- }
-
- /**
- * 鑾峰彇 鏈�
- * @return monthList
- */
- public List<Integer> getMonthList(){
- return this.monthList;
- }
-
- /**
- * 璁剧疆 鏈�
- * @param monthList
- */
- public void setMonthList(List<Integer> monthList){
- this.monthList = monthList;
- }
-
- /**
- * 鑾峰彇 鏈�
- * @return monthNotList
- */
- public List<Integer> getMonthNotList(){
- return this.monthNotList;
- }
-
- /**
- * 璁剧疆 鏈�
- * @param monthNotList
- */
- public void setMonthNotList(List<Integer> monthNotList){
- this.monthNotList = monthNotList;
- }
-
-
- /**
- * 鑾峰彇 寮€濮� 鍒涘缓鏃堕棿
- * @return createTimeStart
- */
- public String getCreateTimeStart(){
- return this.createTimeStart;
- }
-
- /**
- * 璁剧疆 寮€濮� 鍒涘缓鏃堕棿
- * @param createTimeStart
- */
- public void setCreateTimeStart(String createTimeStart){
- this.createTimeStart = createTimeStart;
- }
-
- /**
- * 鑾峰彇 缁撴潫 鍒涘缓鏃堕棿
- * @return createTimeEnd
- */
- public String getCreateTimeEnd(){
- return this.createTimeEnd;
- }
-
- /**
- * 璁剧疆 缁撴潫 鍒涘缓鏃堕棿
- * @param createTimeEnd
- */
- public void setCreateTimeEnd(String createTimeEnd){
- this.createTimeEnd = createTimeEnd;
- }
-
- /**
- * 鑾峰彇 寮€濮� 鍒涘缓浜篿d
- * @return createUserIdStart
- */
- public Long getCreateUserIdStart(){
- return this.createUserIdStart;
- }
-
- /**
- * 璁剧疆 寮€濮� 鍒涘缓浜篿d
- * @param createUserIdStart
- */
- public void setCreateUserIdStart(Long createUserIdStart){
- this.createUserIdStart = createUserIdStart;
- }
-
- /**
- * 鑾峰彇 缁撴潫 鍒涘缓浜篿d
- * @return $createUserIdEnd
- */
- public Long getCreateUserIdEnd(){
- return this.createUserIdEnd;
- }
-
- /**
- * 璁剧疆 缁撴潫 鍒涘缓浜篿d
- * @param createUserIdEnd
- */
- public void setCreateUserIdEnd(Long createUserIdEnd){
- this.createUserIdEnd = createUserIdEnd;
- }
-
- /**
- * 鑾峰彇 澧炲姞 鍒涘缓浜篿d
- * @return createUserIdIncrement
- */
- public Long getCreateUserIdIncrement(){
- return this.createUserIdIncrement;
- }
-
- /**
- * 璁剧疆 澧炲姞 鍒涘缓浜篿d
- * @param createUserIdIncrement
- */
- public void setCreateUserIdIncrement(Long createUserIdIncrement){
- this.createUserIdIncrement = createUserIdIncrement;
- }
-
- /**
- * 鑾峰彇 鍒涘缓浜篿d
- * @return createUserIdList
- */
- public List<Long> getCreateUserIdList(){
- return this.createUserIdList;
- }
-
- /**
- * 璁剧疆 鍒涘缓浜篿d
- * @param createUserIdList
- */
- public void setCreateUserIdList(List<Long> createUserIdList){
- this.createUserIdList = createUserIdList;
- }
-
- /**
- * 鑾峰彇 鍒涘缓浜篿d
- * @return createUserIdNotList
- */
- public List<Long> getCreateUserIdNotList(){
- return this.createUserIdNotList;
- }
-
- /**
- * 璁剧疆 鍒涘缓浜篿d
- * @param createUserIdNotList
- */
- public void setCreateUserIdNotList(List<Long> createUserIdNotList){
- this.createUserIdNotList = createUserIdNotList;
- }
-
-
- /**
- * 鑾峰彇 寮€濮� 鏇存柊鏃堕棿
- * @return updateTimeStart
- */
- public String getUpdateTimeStart(){
- return this.updateTimeStart;
+ * 璁剧疆 鍛樺伐缁╂晥鍔犲垎鎬诲垎鏁版眹鎬�
+ * @param totalAddScoreList
+ */
+ public void setTotalAddScoreList(List<BigDecimal> totalAddScoreList){
+ this.totalAddScoreList = totalAddScoreList;
}
/**
- * 璁剧疆 寮€濮� 鏇存柊鏃堕棿
- * @param updateTimeStart
- */
- public void setUpdateTimeStart(String updateTimeStart){
- this.updateTimeStart = updateTimeStart;
+ * 鑾峰彇 鍛樺伐缁╂晥鍔犲垎鎬诲垎鏁版眹鎬�
+ * @return totalAddScoreNotList
+ */
+ public List<BigDecimal> getTotalAddScoreNotList(){
+ return this.totalAddScoreNotList;
}
/**
- * 鑾峰彇 缁撴潫 鏇存柊鏃堕棿
- * @return updateTimeEnd
- */
- public String getUpdateTimeEnd(){
- return this.updateTimeEnd;
+ * 璁剧疆 鍛樺伐缁╂晥鍔犲垎鎬诲垎鏁版眹鎬�
+ * @param totalAddScoreNotList
+ */
+ public void setTotalAddScoreNotList(List<BigDecimal> totalAddScoreNotList){
+ this.totalAddScoreNotList = totalAddScoreNotList;
}
- /**
- * 璁剧疆 缁撴潫 鏇存柊鏃堕棿
- * @param updateTimeEnd
- */
- public void setUpdateTimeEnd(String updateTimeEnd){
- this.updateTimeEnd = updateTimeEnd;
- }
/**
- * 鑾峰彇 寮€濮� 鏇存柊浜篿d
- * @return updateUserIdStart
- */
- public Long getUpdateUserIdStart(){
- return this.updateUserIdStart;
+ * 鑾峰彇 寮€濮� 鍛樺伐缁╂晥鍑忓垎鎬诲垎鏁版眹鎬�
+ * @return totalSubScoreStart
+ */
+ public BigDecimal getTotalSubScoreStart(){
+ return this.totalSubScoreStart;
}
/**
- * 璁剧疆 寮€濮� 鏇存柊浜篿d
- * @param updateUserIdStart
- */
- public void setUpdateUserIdStart(Long updateUserIdStart){
- this.updateUserIdStart = updateUserIdStart;
+ * 璁剧疆 寮€濮� 鍛樺伐缁╂晥鍑忓垎鎬诲垎鏁版眹鎬�
+ * @param totalSubScoreStart
+ */
+ public void setTotalSubScoreStart(BigDecimal totalSubScoreStart){
+ this.totalSubScoreStart = totalSubScoreStart;
}
/**
- * 鑾峰彇 缁撴潫 鏇存柊浜篿d
- * @return $updateUserIdEnd
- */
- public Long getUpdateUserIdEnd(){
- return this.updateUserIdEnd;
+ * 鑾峰彇 缁撴潫 鍛樺伐缁╂晥鍑忓垎鎬诲垎鏁版眹鎬�
+ * @return $totalSubScoreEnd
+ */
+ public BigDecimal getTotalSubScoreEnd(){
+ return this.totalSubScoreEnd;
}
/**
- * 璁剧疆 缁撴潫 鏇存柊浜篿d
- * @param updateUserIdEnd
- */
- public void setUpdateUserIdEnd(Long updateUserIdEnd){
- this.updateUserIdEnd = updateUserIdEnd;
+ * 璁剧疆 缁撴潫 鍛樺伐缁╂晥鍑忓垎鎬诲垎鏁版眹鎬�
+ * @param totalSubScoreEnd
+ */
+ public void setTotalSubScoreEnd(BigDecimal totalSubScoreEnd){
+ this.totalSubScoreEnd = totalSubScoreEnd;
}
/**
- * 鑾峰彇 澧炲姞 鏇存柊浜篿d
- * @return updateUserIdIncrement
- */
- public Long getUpdateUserIdIncrement(){
- return this.updateUserIdIncrement;
+ * 鑾峰彇 澧炲姞 鍛樺伐缁╂晥鍑忓垎鎬诲垎鏁版眹鎬�
+ * @return totalSubScoreIncrement
+ */
+ public BigDecimal getTotalSubScoreIncrement(){
+ return this.totalSubScoreIncrement;
}
/**
- * 璁剧疆 澧炲姞 鏇存柊浜篿d
- * @param updateUserIdIncrement
- */
- public void setUpdateUserIdIncrement(Long updateUserIdIncrement){
- this.updateUserIdIncrement = updateUserIdIncrement;
+ * 璁剧疆 澧炲姞 鍛樺伐缁╂晥鍑忓垎鎬诲垎鏁版眹鎬�
+ * @param totalSubScoreIncrement
+ */
+ public void setTotalSubScoreIncrement(BigDecimal totalSubScoreIncrement){
+ this.totalSubScoreIncrement = totalSubScoreIncrement;
}
/**
- * 鑾峰彇 鏇存柊浜篿d
- * @return updateUserIdList
- */
- public List<Long> getUpdateUserIdList(){
- return this.updateUserIdList;
+ * 鑾峰彇 鍛樺伐缁╂晥鍑忓垎鎬诲垎鏁版眹鎬�
+ * @return totalSubScoreList
+ */
+ public List<BigDecimal> getTotalSubScoreList(){
+ return this.totalSubScoreList;
}
/**
- * 璁剧疆 鏇存柊浜篿d
- * @param updateUserIdList
- */
- public void setUpdateUserIdList(List<Long> updateUserIdList){
- this.updateUserIdList = updateUserIdList;
+ * 璁剧疆 鍛樺伐缁╂晥鍑忓垎鎬诲垎鏁版眹鎬�
+ * @param totalSubScoreList
+ */
+ public void setTotalSubScoreList(List<BigDecimal> totalSubScoreList){
+ this.totalSubScoreList = totalSubScoreList;
}
/**
- * 鑾峰彇 鏇存柊浜篿d
- * @return updateUserIdNotList
- */
- public List<Long> getUpdateUserIdNotList(){
- return this.updateUserIdNotList;
+ * 鑾峰彇 鍛樺伐缁╂晥鍑忓垎鎬诲垎鏁版眹鎬�
+ * @return totalSubScoreNotList
+ */
+ public List<BigDecimal> getTotalSubScoreNotList(){
+ return this.totalSubScoreNotList;
}
/**
- * 璁剧疆 鏇存柊浜篿d
- * @param updateUserIdNotList
- */
- public void setUpdateUserIdNotList(List<Long> updateUserIdNotList){
- this.updateUserIdNotList = updateUserIdNotList;
+ * 璁剧疆 鍛樺伐缁╂晥鍑忓垎鎬诲垎鏁版眹鎬�
+ * @param totalSubScoreNotList
+ */
+ public void setTotalSubScoreNotList(List<BigDecimal> totalSubScoreNotList){
+ this.totalSubScoreNotList = totalSubScoreNotList;
}
/**
- * 鑾峰彇 寮€濮� 鑰冨嫟缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @return attendScoreAddStart
- */
+ * 鑾峰彇 寮€濮� 鑰冨嫟缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @return attendScoreAddStart
+ */
public BigDecimal getAttendScoreAddStart(){
return this.attendScoreAddStart;
}
/**
- * 璁剧疆 寮€濮� 鑰冨嫟缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @param attendScoreAddStart
- */
+ * 璁剧疆 寮€濮� 鑰冨嫟缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @param attendScoreAddStart
+ */
public void setAttendScoreAddStart(BigDecimal attendScoreAddStart){
this.attendScoreAddStart = attendScoreAddStart;
}
/**
- * 鑾峰彇 缁撴潫 鑰冨嫟缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @return $attendScoreAddEnd
- */
+ * 鑾峰彇 缁撴潫 鑰冨嫟缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @return $attendScoreAddEnd
+ */
public BigDecimal getAttendScoreAddEnd(){
return this.attendScoreAddEnd;
}
/**
- * 璁剧疆 缁撴潫 鑰冨嫟缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @param attendScoreAddEnd
- */
+ * 璁剧疆 缁撴潫 鑰冨嫟缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @param attendScoreAddEnd
+ */
public void setAttendScoreAddEnd(BigDecimal attendScoreAddEnd){
this.attendScoreAddEnd = attendScoreAddEnd;
}
/**
- * 鑾峰彇 澧炲姞 鑰冨嫟缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @return attendScoreAddIncrement
- */
+ * 鑾峰彇 澧炲姞 鑰冨嫟缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @return attendScoreAddIncrement
+ */
public BigDecimal getAttendScoreAddIncrement(){
return this.attendScoreAddIncrement;
}
/**
- * 璁剧疆 澧炲姞 鑰冨嫟缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @param attendScoreAddIncrement
- */
+ * 璁剧疆 澧炲姞 鑰冨嫟缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @param attendScoreAddIncrement
+ */
public void setAttendScoreAddIncrement(BigDecimal attendScoreAddIncrement){
this.attendScoreAddIncrement = attendScoreAddIncrement;
}
/**
- * 鑾峰彇 鑰冨嫟缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @return attendScoreAddList
- */
+ * 鑾峰彇 鑰冨嫟缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @return attendScoreAddList
+ */
public List<BigDecimal> getAttendScoreAddList(){
return this.attendScoreAddList;
}
/**
- * 璁剧疆 鑰冨嫟缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @param attendScoreAddList
- */
+ * 璁剧疆 鑰冨嫟缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @param attendScoreAddList
+ */
public void setAttendScoreAddList(List<BigDecimal> attendScoreAddList){
this.attendScoreAddList = attendScoreAddList;
}
/**
- * 鑾峰彇 鑰冨嫟缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @return attendScoreAddNotList
- */
+ * 鑾峰彇 鑰冨嫟缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @return attendScoreAddNotList
+ */
public List<BigDecimal> getAttendScoreAddNotList(){
return this.attendScoreAddNotList;
}
/**
- * 璁剧疆 鑰冨嫟缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @param attendScoreAddNotList
- */
+ * 璁剧疆 鑰冨嫟缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @param attendScoreAddNotList
+ */
public void setAttendScoreAddNotList(List<BigDecimal> attendScoreAddNotList){
this.attendScoreAddNotList = attendScoreAddNotList;
}
/**
- * 鑾峰彇 寮€濮� 鑰冨嫟缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @return attendScoreSubStart
- */
+ * 鑾峰彇 寮€濮� 鑰冨嫟缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @return attendScoreSubStart
+ */
public BigDecimal getAttendScoreSubStart(){
return this.attendScoreSubStart;
}
/**
- * 璁剧疆 寮€濮� 鑰冨嫟缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @param attendScoreSubStart
- */
+ * 璁剧疆 寮€濮� 鑰冨嫟缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @param attendScoreSubStart
+ */
public void setAttendScoreSubStart(BigDecimal attendScoreSubStart){
this.attendScoreSubStart = attendScoreSubStart;
}
/**
- * 鑾峰彇 缁撴潫 鑰冨嫟缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @return $attendScoreSubEnd
- */
+ * 鑾峰彇 缁撴潫 鑰冨嫟缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @return $attendScoreSubEnd
+ */
public BigDecimal getAttendScoreSubEnd(){
return this.attendScoreSubEnd;
}
/**
- * 璁剧疆 缁撴潫 鑰冨嫟缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @param attendScoreSubEnd
- */
+ * 璁剧疆 缁撴潫 鑰冨嫟缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @param attendScoreSubEnd
+ */
public void setAttendScoreSubEnd(BigDecimal attendScoreSubEnd){
this.attendScoreSubEnd = attendScoreSubEnd;
}
/**
- * 鑾峰彇 澧炲姞 鑰冨嫟缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @return attendScoreSubIncrement
- */
+ * 鑾峰彇 澧炲姞 鑰冨嫟缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @return attendScoreSubIncrement
+ */
public BigDecimal getAttendScoreSubIncrement(){
return this.attendScoreSubIncrement;
}
/**
- * 璁剧疆 澧炲姞 鑰冨嫟缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @param attendScoreSubIncrement
- */
+ * 璁剧疆 澧炲姞 鑰冨嫟缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @param attendScoreSubIncrement
+ */
public void setAttendScoreSubIncrement(BigDecimal attendScoreSubIncrement){
this.attendScoreSubIncrement = attendScoreSubIncrement;
}
/**
- * 鑾峰彇 鑰冨嫟缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @return attendScoreSubList
- */
+ * 鑾峰彇 鑰冨嫟缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @return attendScoreSubList
+ */
public List<BigDecimal> getAttendScoreSubList(){
return this.attendScoreSubList;
}
/**
- * 璁剧疆 鑰冨嫟缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @param attendScoreSubList
- */
+ * 璁剧疆 鑰冨嫟缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @param attendScoreSubList
+ */
public void setAttendScoreSubList(List<BigDecimal> attendScoreSubList){
this.attendScoreSubList = attendScoreSubList;
}
/**
- * 鑾峰彇 鑰冨嫟缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @return attendScoreSubNotList
- */
+ * 鑾峰彇 鑰冨嫟缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @return attendScoreSubNotList
+ */
public List<BigDecimal> getAttendScoreSubNotList(){
return this.attendScoreSubNotList;
}
/**
- * 璁剧疆 鑰冨嫟缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @param attendScoreSubNotList
- */
+ * 璁剧疆 鑰冨嫟缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @param attendScoreSubNotList
+ */
public void setAttendScoreSubNotList(List<BigDecimal> attendScoreSubNotList){
this.attendScoreSubNotList = attendScoreSubNotList;
}
/**
- * 鑾峰彇 寮€濮� 璇勪环缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @return assessScoreAddStart
- */
+ * 鑾峰彇 寮€濮� 璇勪环缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @return assessScoreAddStart
+ */
public BigDecimal getAssessScoreAddStart(){
return this.assessScoreAddStart;
}
/**
- * 璁剧疆 寮€濮� 璇勪环缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @param assessScoreAddStart
- */
+ * 璁剧疆 寮€濮� 璇勪环缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @param assessScoreAddStart
+ */
public void setAssessScoreAddStart(BigDecimal assessScoreAddStart){
this.assessScoreAddStart = assessScoreAddStart;
}
/**
- * 鑾峰彇 缁撴潫 璇勪环缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @return $assessScoreAddEnd
- */
+ * 鑾峰彇 缁撴潫 璇勪环缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @return $assessScoreAddEnd
+ */
public BigDecimal getAssessScoreAddEnd(){
return this.assessScoreAddEnd;
}
/**
- * 璁剧疆 缁撴潫 璇勪环缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @param assessScoreAddEnd
- */
+ * 璁剧疆 缁撴潫 璇勪环缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @param assessScoreAddEnd
+ */
public void setAssessScoreAddEnd(BigDecimal assessScoreAddEnd){
this.assessScoreAddEnd = assessScoreAddEnd;
}
/**
- * 鑾峰彇 澧炲姞 璇勪环缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @return assessScoreAddIncrement
- */
+ * 鑾峰彇 澧炲姞 璇勪环缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @return assessScoreAddIncrement
+ */
public BigDecimal getAssessScoreAddIncrement(){
return this.assessScoreAddIncrement;
}
/**
- * 璁剧疆 澧炲姞 璇勪环缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @param assessScoreAddIncrement
- */
+ * 璁剧疆 澧炲姞 璇勪环缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @param assessScoreAddIncrement
+ */
public void setAssessScoreAddIncrement(BigDecimal assessScoreAddIncrement){
this.assessScoreAddIncrement = assessScoreAddIncrement;
}
/**
- * 鑾峰彇 璇勪环缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @return assessScoreAddList
- */
+ * 鑾峰彇 璇勪环缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @return assessScoreAddList
+ */
public List<BigDecimal> getAssessScoreAddList(){
return this.assessScoreAddList;
}
/**
- * 璁剧疆 璇勪环缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @param assessScoreAddList
- */
+ * 璁剧疆 璇勪环缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @param assessScoreAddList
+ */
public void setAssessScoreAddList(List<BigDecimal> assessScoreAddList){
this.assessScoreAddList = assessScoreAddList;
}
/**
- * 鑾峰彇 璇勪环缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @return assessScoreAddNotList
- */
+ * 鑾峰彇 璇勪环缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @return assessScoreAddNotList
+ */
public List<BigDecimal> getAssessScoreAddNotList(){
return this.assessScoreAddNotList;
}
/**
- * 璁剧疆 璇勪环缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @param assessScoreAddNotList
- */
+ * 璁剧疆 璇勪环缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @param assessScoreAddNotList
+ */
public void setAssessScoreAddNotList(List<BigDecimal> assessScoreAddNotList){
this.assessScoreAddNotList = assessScoreAddNotList;
}
/**
- * 鑾峰彇 寮€濮� 璇勪环缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @return assessScoreSubStart
- */
+ * 鑾峰彇 寮€濮� 璇勪环缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @return assessScoreSubStart
+ */
public BigDecimal getAssessScoreSubStart(){
return this.assessScoreSubStart;
}
/**
- * 璁剧疆 寮€濮� 璇勪环缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @param assessScoreSubStart
- */
+ * 璁剧疆 寮€濮� 璇勪环缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @param assessScoreSubStart
+ */
public void setAssessScoreSubStart(BigDecimal assessScoreSubStart){
this.assessScoreSubStart = assessScoreSubStart;
}
/**
- * 鑾峰彇 缁撴潫 璇勪环缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @return $assessScoreSubEnd
- */
+ * 鑾峰彇 缁撴潫 璇勪环缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @return $assessScoreSubEnd
+ */
public BigDecimal getAssessScoreSubEnd(){
return this.assessScoreSubEnd;
}
/**
- * 璁剧疆 缁撴潫 璇勪环缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @param assessScoreSubEnd
- */
+ * 璁剧疆 缁撴潫 璇勪环缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @param assessScoreSubEnd
+ */
public void setAssessScoreSubEnd(BigDecimal assessScoreSubEnd){
this.assessScoreSubEnd = assessScoreSubEnd;
}
/**
- * 鑾峰彇 澧炲姞 璇勪环缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @return assessScoreSubIncrement
- */
+ * 鑾峰彇 澧炲姞 璇勪环缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @return assessScoreSubIncrement
+ */
public BigDecimal getAssessScoreSubIncrement(){
return this.assessScoreSubIncrement;
}
/**
- * 璁剧疆 澧炲姞 璇勪环缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @param assessScoreSubIncrement
- */
+ * 璁剧疆 澧炲姞 璇勪环缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @param assessScoreSubIncrement
+ */
public void setAssessScoreSubIncrement(BigDecimal assessScoreSubIncrement){
this.assessScoreSubIncrement = assessScoreSubIncrement;
}
/**
- * 鑾峰彇 璇勪环缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @return assessScoreSubList
- */
+ * 鑾峰彇 璇勪环缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @return assessScoreSubList
+ */
public List<BigDecimal> getAssessScoreSubList(){
return this.assessScoreSubList;
}
/**
- * 璁剧疆 璇勪环缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @param assessScoreSubList
- */
+ * 璁剧疆 璇勪环缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @param assessScoreSubList
+ */
public void setAssessScoreSubList(List<BigDecimal> assessScoreSubList){
this.assessScoreSubList = assessScoreSubList;
}
/**
- * 鑾峰彇 璇勪环缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @return assessScoreSubNotList
- */
+ * 鑾峰彇 璇勪环缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @return assessScoreSubNotList
+ */
public List<BigDecimal> getAssessScoreSubNotList(){
return this.assessScoreSubNotList;
}
/**
- * 璁剧疆 璇勪环缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @param assessScoreSubNotList
- */
+ * 璁剧疆 璇勪环缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @param assessScoreSubNotList
+ */
public void setAssessScoreSubNotList(List<BigDecimal> assessScoreSubNotList){
this.assessScoreSubNotList = assessScoreSubNotList;
}
/**
- * 鑾峰彇 寮€濮� 鍔炰欢缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @return workScoreAddStart
- */
- public BigDecimal getWorkScoreAddStart(){
- return this.workScoreAddStart;
+ * 鑾峰彇 寮€濮� 鎶曡瘔缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @return complainScoreAddStart
+ */
+ public BigDecimal getComplainScoreAddStart(){
+ return this.complainScoreAddStart;
}
/**
- * 璁剧疆 寮€濮� 鍔炰欢缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @param workScoreAddStart
- */
- public void setWorkScoreAddStart(BigDecimal workScoreAddStart){
- this.workScoreAddStart = workScoreAddStart;
+ * 璁剧疆 寮€濮� 鎶曡瘔缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @param complainScoreAddStart
+ */
+ public void setComplainScoreAddStart(BigDecimal complainScoreAddStart){
+ this.complainScoreAddStart = complainScoreAddStart;
}
/**
- * 鑾峰彇 缁撴潫 鍔炰欢缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @return $workScoreAddEnd
- */
- public BigDecimal getWorkScoreAddEnd(){
- return this.workScoreAddEnd;
+ * 鑾峰彇 缁撴潫 鎶曡瘔缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @return $complainScoreAddEnd
+ */
+ public BigDecimal getComplainScoreAddEnd(){
+ return this.complainScoreAddEnd;
}
/**
- * 璁剧疆 缁撴潫 鍔炰欢缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @param workScoreAddEnd
- */
- public void setWorkScoreAddEnd(BigDecimal workScoreAddEnd){
- this.workScoreAddEnd = workScoreAddEnd;
+ * 璁剧疆 缁撴潫 鎶曡瘔缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @param complainScoreAddEnd
+ */
+ public void setComplainScoreAddEnd(BigDecimal complainScoreAddEnd){
+ this.complainScoreAddEnd = complainScoreAddEnd;
}
/**
- * 鑾峰彇 澧炲姞 鍔炰欢缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @return workScoreAddIncrement
- */
- public BigDecimal getWorkScoreAddIncrement(){
- return this.workScoreAddIncrement;
+ * 鑾峰彇 澧炲姞 鎶曡瘔缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @return complainScoreAddIncrement
+ */
+ public BigDecimal getComplainScoreAddIncrement(){
+ return this.complainScoreAddIncrement;
}
/**
- * 璁剧疆 澧炲姞 鍔炰欢缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @param workScoreAddIncrement
- */
- public void setWorkScoreAddIncrement(BigDecimal workScoreAddIncrement){
- this.workScoreAddIncrement = workScoreAddIncrement;
+ * 璁剧疆 澧炲姞 鎶曡瘔缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @param complainScoreAddIncrement
+ */
+ public void setComplainScoreAddIncrement(BigDecimal complainScoreAddIncrement){
+ this.complainScoreAddIncrement = complainScoreAddIncrement;
}
/**
- * 鑾峰彇 鍔炰欢缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @return workScoreAddList
- */
- public List<BigDecimal> getWorkScoreAddList(){
- return this.workScoreAddList;
+ * 鑾峰彇 鎶曡瘔缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @return complainScoreAddList
+ */
+ public List<BigDecimal> getComplainScoreAddList(){
+ return this.complainScoreAddList;
}
/**
- * 璁剧疆 鍔炰欢缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @param workScoreAddList
- */
- public void setWorkScoreAddList(List<BigDecimal> workScoreAddList){
- this.workScoreAddList = workScoreAddList;
+ * 璁剧疆 鎶曡瘔缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @param complainScoreAddList
+ */
+ public void setComplainScoreAddList(List<BigDecimal> complainScoreAddList){
+ this.complainScoreAddList = complainScoreAddList;
}
/**
- * 鑾峰彇 鍔炰欢缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @return workScoreAddNotList
- */
- public List<BigDecimal> getWorkScoreAddNotList(){
- return this.workScoreAddNotList;
+ * 鑾峰彇 鎶曡瘔缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @return complainScoreAddNotList
+ */
+ public List<BigDecimal> getComplainScoreAddNotList(){
+ return this.complainScoreAddNotList;
}
/**
- * 璁剧疆 鍔炰欢缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @param workScoreAddNotList
- */
- public void setWorkScoreAddNotList(List<BigDecimal> workScoreAddNotList){
- this.workScoreAddNotList = workScoreAddNotList;
+ * 璁剧疆 鎶曡瘔缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @param complainScoreAddNotList
+ */
+ public void setComplainScoreAddNotList(List<BigDecimal> complainScoreAddNotList){
+ this.complainScoreAddNotList = complainScoreAddNotList;
}
/**
- * 鑾峰彇 寮€濮� 鍔炰欢缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @return workScoreSubStart
- */
- public BigDecimal getWorkScoreSubStart(){
- return this.workScoreSubStart;
+ * 鑾峰彇 寮€濮� 鎶曡瘔缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @return complainScoreSubStart
+ */
+ public BigDecimal getComplainScoreSubStart(){
+ return this.complainScoreSubStart;
}
/**
- * 璁剧疆 寮€濮� 鍔炰欢缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @param workScoreSubStart
- */
+ * 璁剧疆 寮€濮� 鎶曡瘔缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @param complainScoreSubStart
+ */
+ public void setComplainScoreSubStart(BigDecimal complainScoreSubStart){
+ this.complainScoreSubStart = complainScoreSubStart;
+ }
+
+ /**
+ * 鑾峰彇 缁撴潫 鎶曡瘔缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @return $complainScoreSubEnd
+ */
+ public BigDecimal getComplainScoreSubEnd(){
+ return this.complainScoreSubEnd;
+ }
+
+ /**
+ * 璁剧疆 缁撴潫 鎶曡瘔缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @param complainScoreSubEnd
+ */
+ public void setComplainScoreSubEnd(BigDecimal complainScoreSubEnd){
+ this.complainScoreSubEnd = complainScoreSubEnd;
+ }
+
+ /**
+ * 鑾峰彇 澧炲姞 鎶曡瘔缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @return complainScoreSubIncrement
+ */
+ public BigDecimal getComplainScoreSubIncrement(){
+ return this.complainScoreSubIncrement;
+ }
+
+ /**
+ * 璁剧疆 澧炲姞 鎶曡瘔缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @param complainScoreSubIncrement
+ */
+ public void setComplainScoreSubIncrement(BigDecimal complainScoreSubIncrement){
+ this.complainScoreSubIncrement = complainScoreSubIncrement;
+ }
+
+ /**
+ * 鑾峰彇 鎶曡瘔缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @return complainScoreSubList
+ */
+ public List<BigDecimal> getComplainScoreSubList(){
+ return this.complainScoreSubList;
+ }
+
+ /**
+ * 璁剧疆 鎶曡瘔缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @param complainScoreSubList
+ */
+ public void setComplainScoreSubList(List<BigDecimal> complainScoreSubList){
+ this.complainScoreSubList = complainScoreSubList;
+ }
+
+ /**
+ * 鑾峰彇 鎶曡瘔缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @return complainScoreSubNotList
+ */
+ public List<BigDecimal> getComplainScoreSubNotList(){
+ return this.complainScoreSubNotList;
+ }
+
+ /**
+ * 璁剧疆 鎶曡瘔缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @param complainScoreSubNotList
+ */
+ public void setComplainScoreSubNotList(List<BigDecimal> complainScoreSubNotList){
+ this.complainScoreSubNotList = complainScoreSubNotList;
+ }
+
+
+ /**
+ * 鑾峰彇 寮€濮� 鍔炰欢缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @return workScoreAddStart
+ */
+ public BigDecimal getWorkScoreAddStart(){
+ return this.workScoreAddStart;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 鍔炰欢缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @param workScoreAddStart
+ */
+ public void setWorkScoreAddStart(BigDecimal workScoreAddStart){
+ this.workScoreAddStart = workScoreAddStart;
+ }
+
+ /**
+ * 鑾峰彇 缁撴潫 鍔炰欢缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @return $workScoreAddEnd
+ */
+ public BigDecimal getWorkScoreAddEnd(){
+ return this.workScoreAddEnd;
+ }
+
+ /**
+ * 璁剧疆 缁撴潫 鍔炰欢缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @param workScoreAddEnd
+ */
+ public void setWorkScoreAddEnd(BigDecimal workScoreAddEnd){
+ this.workScoreAddEnd = workScoreAddEnd;
+ }
+
+ /**
+ * 鑾峰彇 澧炲姞 鍔炰欢缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @return workScoreAddIncrement
+ */
+ public BigDecimal getWorkScoreAddIncrement(){
+ return this.workScoreAddIncrement;
+ }
+
+ /**
+ * 璁剧疆 澧炲姞 鍔炰欢缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @param workScoreAddIncrement
+ */
+ public void setWorkScoreAddIncrement(BigDecimal workScoreAddIncrement){
+ this.workScoreAddIncrement = workScoreAddIncrement;
+ }
+
+ /**
+ * 鑾峰彇 鍔炰欢缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @return workScoreAddList
+ */
+ public List<BigDecimal> getWorkScoreAddList(){
+ return this.workScoreAddList;
+ }
+
+ /**
+ * 璁剧疆 鍔炰欢缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @param workScoreAddList
+ */
+ public void setWorkScoreAddList(List<BigDecimal> workScoreAddList){
+ this.workScoreAddList = workScoreAddList;
+ }
+
+ /**
+ * 鑾峰彇 鍔炰欢缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @return workScoreAddNotList
+ */
+ public List<BigDecimal> getWorkScoreAddNotList(){
+ return this.workScoreAddNotList;
+ }
+
+ /**
+ * 璁剧疆 鍔炰欢缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @param workScoreAddNotList
+ */
+ public void setWorkScoreAddNotList(List<BigDecimal> workScoreAddNotList){
+ this.workScoreAddNotList = workScoreAddNotList;
+ }
+
+
+ /**
+ * 鑾峰彇 寮€濮� 鍔炰欢缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @return workScoreSubStart
+ */
+ public BigDecimal getWorkScoreSubStart(){
+ return this.workScoreSubStart;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 鍔炰欢缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @param workScoreSubStart
+ */
public void setWorkScoreSubStart(BigDecimal workScoreSubStart){
this.workScoreSubStart = workScoreSubStart;
}
/**
- * 鑾峰彇 缁撴潫 鍔炰欢缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @return $workScoreSubEnd
- */
+ * 鑾峰彇 缁撴潫 鍔炰欢缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @return $workScoreSubEnd
+ */
public BigDecimal getWorkScoreSubEnd(){
return this.workScoreSubEnd;
}
/**
- * 璁剧疆 缁撴潫 鍔炰欢缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @param workScoreSubEnd
- */
+ * 璁剧疆 缁撴潫 鍔炰欢缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @param workScoreSubEnd
+ */
public void setWorkScoreSubEnd(BigDecimal workScoreSubEnd){
this.workScoreSubEnd = workScoreSubEnd;
}
/**
- * 鑾峰彇 澧炲姞 鍔炰欢缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @return workScoreSubIncrement
- */
+ * 鑾峰彇 澧炲姞 鍔炰欢缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @return workScoreSubIncrement
+ */
public BigDecimal getWorkScoreSubIncrement(){
return this.workScoreSubIncrement;
}
/**
- * 璁剧疆 澧炲姞 鍔炰欢缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @param workScoreSubIncrement
- */
+ * 璁剧疆 澧炲姞 鍔炰欢缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @param workScoreSubIncrement
+ */
public void setWorkScoreSubIncrement(BigDecimal workScoreSubIncrement){
this.workScoreSubIncrement = workScoreSubIncrement;
}
/**
- * 鑾峰彇 鍔炰欢缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @return workScoreSubList
- */
+ * 鑾峰彇 鍔炰欢缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @return workScoreSubList
+ */
public List<BigDecimal> getWorkScoreSubList(){
return this.workScoreSubList;
}
/**
- * 璁剧疆 鍔炰欢缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @param workScoreSubList
- */
+ * 璁剧疆 鍔炰欢缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @param workScoreSubList
+ */
public void setWorkScoreSubList(List<BigDecimal> workScoreSubList){
this.workScoreSubList = workScoreSubList;
}
/**
- * 鑾峰彇 鍔炰欢缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @return workScoreSubNotList
- */
+ * 鑾峰彇 鍔炰欢缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @return workScoreSubNotList
+ */
public List<BigDecimal> getWorkScoreSubNotList(){
return this.workScoreSubNotList;
}
/**
- * 璁剧疆 鍔炰欢缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @param workScoreSubNotList
- */
+ * 璁剧疆 鍔炰欢缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @param workScoreSubNotList
+ */
public void setWorkScoreSubNotList(List<BigDecimal> workScoreSubNotList){
this.workScoreSubNotList = workScoreSubNotList;
}
/**
- * 鑾峰彇 寮€濮� 鏁堣兘缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @return effectScoreAddStart
- */
+ * 鑾峰彇 寮€濮� 鏁堣兘缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @return effectScoreAddStart
+ */
public BigDecimal getEffectScoreAddStart(){
return this.effectScoreAddStart;
}
/**
- * 璁剧疆 寮€濮� 鏁堣兘缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @param effectScoreAddStart
- */
+ * 璁剧疆 寮€濮� 鏁堣兘缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @param effectScoreAddStart
+ */
public void setEffectScoreAddStart(BigDecimal effectScoreAddStart){
this.effectScoreAddStart = effectScoreAddStart;
}
/**
- * 鑾峰彇 缁撴潫 鏁堣兘缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @return $effectScoreAddEnd
- */
+ * 鑾峰彇 缁撴潫 鏁堣兘缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @return $effectScoreAddEnd
+ */
public BigDecimal getEffectScoreAddEnd(){
return this.effectScoreAddEnd;
}
/**
- * 璁剧疆 缁撴潫 鏁堣兘缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @param effectScoreAddEnd
- */
+ * 璁剧疆 缁撴潫 鏁堣兘缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @param effectScoreAddEnd
+ */
public void setEffectScoreAddEnd(BigDecimal effectScoreAddEnd){
this.effectScoreAddEnd = effectScoreAddEnd;
}
/**
- * 鑾峰彇 澧炲姞 鏁堣兘缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @return effectScoreAddIncrement
- */
+ * 鑾峰彇 澧炲姞 鏁堣兘缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @return effectScoreAddIncrement
+ */
public BigDecimal getEffectScoreAddIncrement(){
return this.effectScoreAddIncrement;
}
/**
- * 璁剧疆 澧炲姞 鏁堣兘缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @param effectScoreAddIncrement
- */
+ * 璁剧疆 澧炲姞 鏁堣兘缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @param effectScoreAddIncrement
+ */
public void setEffectScoreAddIncrement(BigDecimal effectScoreAddIncrement){
this.effectScoreAddIncrement = effectScoreAddIncrement;
}
/**
- * 鑾峰彇 鏁堣兘缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @return effectScoreAddList
- */
+ * 鑾峰彇 鏁堣兘缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @return effectScoreAddList
+ */
public List<BigDecimal> getEffectScoreAddList(){
return this.effectScoreAddList;
}
/**
- * 璁剧疆 鏁堣兘缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @param effectScoreAddList
- */
+ * 璁剧疆 鏁堣兘缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @param effectScoreAddList
+ */
public void setEffectScoreAddList(List<BigDecimal> effectScoreAddList){
this.effectScoreAddList = effectScoreAddList;
}
/**
- * 鑾峰彇 鏁堣兘缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @return effectScoreAddNotList
- */
+ * 鑾峰彇 鏁堣兘缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @return effectScoreAddNotList
+ */
public List<BigDecimal> getEffectScoreAddNotList(){
return this.effectScoreAddNotList;
}
/**
- * 璁剧疆 鏁堣兘缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @param effectScoreAddNotList
- */
+ * 璁剧疆 鏁堣兘缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @param effectScoreAddNotList
+ */
public void setEffectScoreAddNotList(List<BigDecimal> effectScoreAddNotList){
this.effectScoreAddNotList = effectScoreAddNotList;
}
/**
- * 鑾峰彇 寮€濮� 鏁堣兘缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @return effectScoreSubStart
- */
+ * 鑾峰彇 寮€濮� 鏁堣兘缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @return effectScoreSubStart
+ */
public BigDecimal getEffectScoreSubStart(){
return this.effectScoreSubStart;
}
/**
- * 璁剧疆 寮€濮� 鏁堣兘缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @param effectScoreSubStart
- */
+ * 璁剧疆 寮€濮� 鏁堣兘缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @param effectScoreSubStart
+ */
public void setEffectScoreSubStart(BigDecimal effectScoreSubStart){
this.effectScoreSubStart = effectScoreSubStart;
}
/**
- * 鑾峰彇 缁撴潫 鏁堣兘缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @return $effectScoreSubEnd
- */
+ * 鑾峰彇 缁撴潫 鏁堣兘缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @return $effectScoreSubEnd
+ */
public BigDecimal getEffectScoreSubEnd(){
return this.effectScoreSubEnd;
}
/**
- * 璁剧疆 缁撴潫 鏁堣兘缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @param effectScoreSubEnd
- */
+ * 璁剧疆 缁撴潫 鏁堣兘缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @param effectScoreSubEnd
+ */
public void setEffectScoreSubEnd(BigDecimal effectScoreSubEnd){
this.effectScoreSubEnd = effectScoreSubEnd;
}
/**
- * 鑾峰彇 澧炲姞 鏁堣兘缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @return effectScoreSubIncrement
- */
+ * 鑾峰彇 澧炲姞 鏁堣兘缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @return effectScoreSubIncrement
+ */
public BigDecimal getEffectScoreSubIncrement(){
return this.effectScoreSubIncrement;
}
/**
- * 璁剧疆 澧炲姞 鏁堣兘缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @param effectScoreSubIncrement
- */
+ * 璁剧疆 澧炲姞 鏁堣兘缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @param effectScoreSubIncrement
+ */
public void setEffectScoreSubIncrement(BigDecimal effectScoreSubIncrement){
this.effectScoreSubIncrement = effectScoreSubIncrement;
}
/**
- * 鑾峰彇 鏁堣兘缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @return effectScoreSubList
- */
+ * 鑾峰彇 鏁堣兘缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @return effectScoreSubList
+ */
public List<BigDecimal> getEffectScoreSubList(){
return this.effectScoreSubList;
}
/**
- * 璁剧疆 鏁堣兘缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @param effectScoreSubList
- */
+ * 璁剧疆 鏁堣兘缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @param effectScoreSubList
+ */
public void setEffectScoreSubList(List<BigDecimal> effectScoreSubList){
this.effectScoreSubList = effectScoreSubList;
}
/**
- * 鑾峰彇 鏁堣兘缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @return effectScoreSubNotList
- */
+ * 鑾峰彇 鏁堣兘缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @return effectScoreSubNotList
+ */
public List<BigDecimal> getEffectScoreSubNotList(){
return this.effectScoreSubNotList;
}
/**
- * 璁剧疆 鏁堣兘缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @param effectScoreSubNotList
- */
+ * 璁剧疆 鏁堣兘缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @param effectScoreSubNotList
+ */
public void setEffectScoreSubNotList(List<BigDecimal> effectScoreSubNotList){
this.effectScoreSubNotList = effectScoreSubNotList;
}
/**
- * 鑾峰彇 寮€濮� 鍏跺畠缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @return otherScoreAddStart
- */
+ * 鑾峰彇 寮€濮� 鍏跺畠缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @return otherScoreAddStart
+ */
public BigDecimal getOtherScoreAddStart(){
return this.otherScoreAddStart;
}
/**
- * 璁剧疆 寮€濮� 鍏跺畠缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @param otherScoreAddStart
- */
+ * 璁剧疆 寮€濮� 鍏跺畠缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @param otherScoreAddStart
+ */
public void setOtherScoreAddStart(BigDecimal otherScoreAddStart){
this.otherScoreAddStart = otherScoreAddStart;
}
/**
- * 鑾峰彇 缁撴潫 鍏跺畠缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @return $otherScoreAddEnd
- */
+ * 鑾峰彇 缁撴潫 鍏跺畠缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @return $otherScoreAddEnd
+ */
public BigDecimal getOtherScoreAddEnd(){
return this.otherScoreAddEnd;
}
/**
- * 璁剧疆 缁撴潫 鍏跺畠缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @param otherScoreAddEnd
- */
+ * 璁剧疆 缁撴潫 鍏跺畠缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @param otherScoreAddEnd
+ */
public void setOtherScoreAddEnd(BigDecimal otherScoreAddEnd){
this.otherScoreAddEnd = otherScoreAddEnd;
}
/**
- * 鑾峰彇 澧炲姞 鍏跺畠缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @return otherScoreAddIncrement
- */
+ * 鑾峰彇 澧炲姞 鍏跺畠缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @return otherScoreAddIncrement
+ */
public BigDecimal getOtherScoreAddIncrement(){
return this.otherScoreAddIncrement;
}
/**
- * 璁剧疆 澧炲姞 鍏跺畠缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @param otherScoreAddIncrement
- */
+ * 璁剧疆 澧炲姞 鍏跺畠缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @param otherScoreAddIncrement
+ */
public void setOtherScoreAddIncrement(BigDecimal otherScoreAddIncrement){
this.otherScoreAddIncrement = otherScoreAddIncrement;
}
/**
- * 鑾峰彇 鍏跺畠缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @return otherScoreAddList
- */
+ * 鑾峰彇 鍏跺畠缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @return otherScoreAddList
+ */
public List<BigDecimal> getOtherScoreAddList(){
return this.otherScoreAddList;
}
/**
- * 璁剧疆 鍏跺畠缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @param otherScoreAddList
- */
+ * 璁剧疆 鍏跺畠缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @param otherScoreAddList
+ */
public void setOtherScoreAddList(List<BigDecimal> otherScoreAddList){
this.otherScoreAddList = otherScoreAddList;
}
/**
- * 鑾峰彇 鍏跺畠缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @return otherScoreAddNotList
- */
+ * 鑾峰彇 鍏跺畠缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @return otherScoreAddNotList
+ */
public List<BigDecimal> getOtherScoreAddNotList(){
return this.otherScoreAddNotList;
}
/**
- * 璁剧疆 鍏跺畠缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @param otherScoreAddNotList
- */
+ * 璁剧疆 鍏跺畠缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @param otherScoreAddNotList
+ */
public void setOtherScoreAddNotList(List<BigDecimal> otherScoreAddNotList){
this.otherScoreAddNotList = otherScoreAddNotList;
}
/**
- * 鑾峰彇 寮€濮� 鍏跺畠缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @return otherScoreSubStart
- */
+ * 鑾峰彇 寮€濮� 鍏跺畠缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @return otherScoreSubStart
+ */
public BigDecimal getOtherScoreSubStart(){
return this.otherScoreSubStart;
}
/**
- * 璁剧疆 寮€濮� 鍏跺畠缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @param otherScoreSubStart
- */
+ * 璁剧疆 寮€濮� 鍏跺畠缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @param otherScoreSubStart
+ */
public void setOtherScoreSubStart(BigDecimal otherScoreSubStart){
this.otherScoreSubStart = otherScoreSubStart;
}
/**
- * 鑾峰彇 缁撴潫 鍏跺畠缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @return $otherScoreSubEnd
- */
+ * 鑾峰彇 缁撴潫 鍏跺畠缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @return $otherScoreSubEnd
+ */
public BigDecimal getOtherScoreSubEnd(){
return this.otherScoreSubEnd;
}
/**
- * 璁剧疆 缁撴潫 鍏跺畠缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @param otherScoreSubEnd
- */
+ * 璁剧疆 缁撴潫 鍏跺畠缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @param otherScoreSubEnd
+ */
public void setOtherScoreSubEnd(BigDecimal otherScoreSubEnd){
this.otherScoreSubEnd = otherScoreSubEnd;
}
/**
- * 鑾峰彇 澧炲姞 鍏跺畠缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @return otherScoreSubIncrement
- */
+ * 鑾峰彇 澧炲姞 鍏跺畠缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @return otherScoreSubIncrement
+ */
public BigDecimal getOtherScoreSubIncrement(){
return this.otherScoreSubIncrement;
}
/**
- * 璁剧疆 澧炲姞 鍏跺畠缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @param otherScoreSubIncrement
- */
+ * 璁剧疆 澧炲姞 鍏跺畠缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @param otherScoreSubIncrement
+ */
public void setOtherScoreSubIncrement(BigDecimal otherScoreSubIncrement){
this.otherScoreSubIncrement = otherScoreSubIncrement;
}
/**
- * 鑾峰彇 鍏跺畠缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @return otherScoreSubList
- */
+ * 鑾峰彇 鍏跺畠缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @return otherScoreSubList
+ */
public List<BigDecimal> getOtherScoreSubList(){
return this.otherScoreSubList;
}
/**
- * 璁剧疆 鍏跺畠缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @param otherScoreSubList
- */
+ * 璁剧疆 鍏跺畠缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @param otherScoreSubList
+ */
public void setOtherScoreSubList(List<BigDecimal> otherScoreSubList){
this.otherScoreSubList = otherScoreSubList;
}
/**
- * 鑾峰彇 鍏跺畠缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @return otherScoreSubNotList
- */
+ * 鑾峰彇 鍏跺畠缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @return otherScoreSubNotList
+ */
public List<BigDecimal> getOtherScoreSubNotList(){
return this.otherScoreSubNotList;
}
/**
- * 璁剧疆 鍏跺畠缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @param otherScoreSubNotList
- */
+ * 璁剧疆 鍏跺畠缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @param otherScoreSubNotList
+ */
public void setOtherScoreSubNotList(List<BigDecimal> otherScoreSubNotList){
this.otherScoreSubNotList = otherScoreSubNotList;
}
/**
- * 鑾峰彇 寮€濮� 鏃�
- * @return dayStart
- */
- public Integer getDayStart(){
- return this.dayStart;
+ * 鑾峰彇 澶囨敞
+ * @return remarkList
+ */
+ public List<String> getRemarkList(){
+ return this.remarkList;
}
/**
- * 璁剧疆 寮€濮� 鏃�
- * @param dayStart
- */
- public void setDayStart(Integer dayStart){
- this.dayStart = dayStart;
+ * 璁剧疆 澶囨敞
+ * @param remarkList
+ */
+ public void setRemarkList(List<String> remarkList){
+ this.remarkList = remarkList;
}
/**
- * 鑾峰彇 缁撴潫 鏃�
- * @return $dayEnd
- */
- public Integer getDayEnd(){
- return this.dayEnd;
+ * 鑾峰彇 澶囨敞
+ * @return remarkNotList
+ */
+ public List<String> getRemarkNotList(){
+ return this.remarkNotList;
}
/**
- * 璁剧疆 缁撴潫 鏃�
- * @param dayEnd
- */
- public void setDayEnd(Integer dayEnd){
- this.dayEnd = dayEnd;
+ * 璁剧疆 澶囨敞
+ * @param remarkNotList
+ */
+ public void setRemarkNotList(List<String> remarkNotList){
+ this.remarkNotList = remarkNotList;
}
/**
- * 鑾峰彇 澧炲姞 鏃�
- * @return dayIncrement
- */
- public Integer getDayIncrement(){
- return this.dayIncrement;
+ * 鑾峰彇 寮€濮� 骞�
+ * @return yearStart
+ */
+ public Integer getYearStart(){
+ return this.yearStart;
}
/**
- * 璁剧疆 澧炲姞 鏃�
- * @param dayIncrement
- */
- public void setDayIncrement(Integer dayIncrement){
- this.dayIncrement = dayIncrement;
+ * 璁剧疆 寮€濮� 骞�
+ * @param yearStart
+ */
+ public void setYearStart(Integer yearStart){
+ this.yearStart = yearStart;
}
/**
- * 鑾峰彇 鏃�
- * @return dayList
- */
- public List<Integer> getDayList(){
- return this.dayList;
+ * 鑾峰彇 缁撴潫 骞�
+ * @return $yearEnd
+ */
+ public Integer getYearEnd(){
+ return this.yearEnd;
}
/**
- * 璁剧疆 鏃�
- * @param dayList
- */
- public void setDayList(List<Integer> dayList){
- this.dayList = dayList;
+ * 璁剧疆 缁撴潫 骞�
+ * @param yearEnd
+ */
+ public void setYearEnd(Integer yearEnd){
+ this.yearEnd = yearEnd;
}
/**
- * 鑾峰彇 鏃�
- * @return dayNotList
- */
- public List<Integer> getDayNotList(){
- return this.dayNotList;
+ * 鑾峰彇 澧炲姞 骞�
+ * @return yearIncrement
+ */
+ public Integer getYearIncrement(){
+ return this.yearIncrement;
}
/**
- * 璁剧疆 鏃�
- * @param dayNotList
- */
- public void setDayNotList(List<Integer> dayNotList){
- this.dayNotList = dayNotList;
+ * 璁剧疆 澧炲姞 骞�
+ * @param yearIncrement
+ */
+ public void setYearIncrement(Integer yearIncrement){
+ this.yearIncrement = yearIncrement;
}
-
/**
- * 鑾峰彇 寮€濮� 鍛樺伐缁╂晥鍔犲垎鎬诲垎鏁版眹鎬�
- * @return totalAddScoreStart
- */
- public BigDecimal getTotalAddScoreStart(){
- return this.totalAddScoreStart;
+ * 鑾峰彇 骞�
+ * @return yearList
+ */
+ public List<Integer> getYearList(){
+ return this.yearList;
}
/**
- * 璁剧疆 寮€濮� 鍛樺伐缁╂晥鍔犲垎鎬诲垎鏁版眹鎬�
- * @param totalAddScoreStart
- */
- public void setTotalAddScoreStart(BigDecimal totalAddScoreStart){
- this.totalAddScoreStart = totalAddScoreStart;
+ * 璁剧疆 骞�
+ * @param yearList
+ */
+ public void setYearList(List<Integer> yearList){
+ this.yearList = yearList;
}
/**
- * 鑾峰彇 缁撴潫 鍛樺伐缁╂晥鍔犲垎鎬诲垎鏁版眹鎬�
- * @return $totalAddScoreEnd
- */
- public BigDecimal getTotalAddScoreEnd(){
- return this.totalAddScoreEnd;
+ * 鑾峰彇 骞�
+ * @return yearNotList
+ */
+ public List<Integer> getYearNotList(){
+ return this.yearNotList;
}
/**
- * 璁剧疆 缁撴潫 鍛樺伐缁╂晥鍔犲垎鎬诲垎鏁版眹鎬�
- * @param totalAddScoreEnd
- */
- public void setTotalAddScoreEnd(BigDecimal totalAddScoreEnd){
- this.totalAddScoreEnd = totalAddScoreEnd;
+ * 璁剧疆 骞�
+ * @param yearNotList
+ */
+ public void setYearNotList(List<Integer> yearNotList){
+ this.yearNotList = yearNotList;
}
+
/**
- * 鑾峰彇 澧炲姞 鍛樺伐缁╂晥鍔犲垎鎬诲垎鏁版眹鎬�
- * @return totalAddScoreIncrement
- */
- public BigDecimal getTotalAddScoreIncrement(){
- return this.totalAddScoreIncrement;
+ * 鑾峰彇 寮€濮� 鏈�
+ * @return monthStart
+ */
+ public Integer getMonthStart(){
+ return this.monthStart;
}
/**
- * 璁剧疆 澧炲姞 鍛樺伐缁╂晥鍔犲垎鎬诲垎鏁版眹鎬�
- * @param totalAddScoreIncrement
- */
- public void setTotalAddScoreIncrement(BigDecimal totalAddScoreIncrement){
- this.totalAddScoreIncrement = totalAddScoreIncrement;
+ * 璁剧疆 寮€濮� 鏈�
+ * @param monthStart
+ */
+ public void setMonthStart(Integer monthStart){
+ this.monthStart = monthStart;
}
/**
- * 鑾峰彇 鍛樺伐缁╂晥鍔犲垎鎬诲垎鏁版眹鎬�
- * @return totalAddScoreList
- */
- public List<BigDecimal> getTotalAddScoreList(){
- return this.totalAddScoreList;
+ * 鑾峰彇 缁撴潫 鏈�
+ * @return $monthEnd
+ */
+ public Integer getMonthEnd(){
+ return this.monthEnd;
}
/**
- * 璁剧疆 鍛樺伐缁╂晥鍔犲垎鎬诲垎鏁版眹鎬�
- * @param totalAddScoreList
- */
- public void setTotalAddScoreList(List<BigDecimal> totalAddScoreList){
- this.totalAddScoreList = totalAddScoreList;
+ * 璁剧疆 缁撴潫 鏈�
+ * @param monthEnd
+ */
+ public void setMonthEnd(Integer monthEnd){
+ this.monthEnd = monthEnd;
}
/**
- * 鑾峰彇 鍛樺伐缁╂晥鍔犲垎鎬诲垎鏁版眹鎬�
- * @return totalAddScoreNotList
- */
- public List<BigDecimal> getTotalAddScoreNotList(){
- return this.totalAddScoreNotList;
+ * 鑾峰彇 澧炲姞 鏈�
+ * @return monthIncrement
+ */
+ public Integer getMonthIncrement(){
+ return this.monthIncrement;
}
/**
- * 璁剧疆 鍛樺伐缁╂晥鍔犲垎鎬诲垎鏁版眹鎬�
- * @param totalAddScoreNotList
- */
- public void setTotalAddScoreNotList(List<BigDecimal> totalAddScoreNotList){
- this.totalAddScoreNotList = totalAddScoreNotList;
+ * 璁剧疆 澧炲姞 鏈�
+ * @param monthIncrement
+ */
+ public void setMonthIncrement(Integer monthIncrement){
+ this.monthIncrement = monthIncrement;
}
-
/**
- * 鑾峰彇 寮€濮� 鍛樺伐缁╂晥鍑忓垎鎬诲垎鏁版眹鎬�
- * @return totalSubScoreStart
- */
- public BigDecimal getTotalSubScoreStart(){
- return this.totalSubScoreStart;
+ * 鑾峰彇 鏈�
+ * @return monthList
+ */
+ public List<Integer> getMonthList(){
+ return this.monthList;
}
/**
- * 璁剧疆 寮€濮� 鍛樺伐缁╂晥鍑忓垎鎬诲垎鏁版眹鎬�
- * @param totalSubScoreStart
- */
- public void setTotalSubScoreStart(BigDecimal totalSubScoreStart){
- this.totalSubScoreStart = totalSubScoreStart;
+ * 璁剧疆 鏈�
+ * @param monthList
+ */
+ public void setMonthList(List<Integer> monthList){
+ this.monthList = monthList;
}
/**
- * 鑾峰彇 缁撴潫 鍛樺伐缁╂晥鍑忓垎鎬诲垎鏁版眹鎬�
- * @return $totalSubScoreEnd
- */
- public BigDecimal getTotalSubScoreEnd(){
- return this.totalSubScoreEnd;
+ * 鑾峰彇 鏈�
+ * @return monthNotList
+ */
+ public List<Integer> getMonthNotList(){
+ return this.monthNotList;
}
/**
- * 璁剧疆 缁撴潫 鍛樺伐缁╂晥鍑忓垎鎬诲垎鏁版眹鎬�
- * @param totalSubScoreEnd
- */
- public void setTotalSubScoreEnd(BigDecimal totalSubScoreEnd){
- this.totalSubScoreEnd = totalSubScoreEnd;
+ * 璁剧疆 鏈�
+ * @param monthNotList
+ */
+ public void setMonthNotList(List<Integer> monthNotList){
+ this.monthNotList = monthNotList;
}
+
/**
- * 鑾峰彇 澧炲姞 鍛樺伐缁╂晥鍑忓垎鎬诲垎鏁版眹鎬�
- * @return totalSubScoreIncrement
- */
- public BigDecimal getTotalSubScoreIncrement(){
- return this.totalSubScoreIncrement;
+ * 鑾峰彇 寮€濮� 鏃�
+ * @return dayStart
+ */
+ public Integer getDayStart(){
+ return this.dayStart;
}
/**
- * 璁剧疆 澧炲姞 鍛樺伐缁╂晥鍑忓垎鎬诲垎鏁版眹鎬�
- * @param totalSubScoreIncrement
- */
- public void setTotalSubScoreIncrement(BigDecimal totalSubScoreIncrement){
- this.totalSubScoreIncrement = totalSubScoreIncrement;
+ * 璁剧疆 寮€濮� 鏃�
+ * @param dayStart
+ */
+ public void setDayStart(Integer dayStart){
+ this.dayStart = dayStart;
}
/**
- * 鑾峰彇 鍛樺伐缁╂晥鍑忓垎鎬诲垎鏁版眹鎬�
- * @return totalSubScoreList
- */
- public List<BigDecimal> getTotalSubScoreList(){
- return this.totalSubScoreList;
+ * 鑾峰彇 缁撴潫 鏃�
+ * @return $dayEnd
+ */
+ public Integer getDayEnd(){
+ return this.dayEnd;
}
/**
- * 璁剧疆 鍛樺伐缁╂晥鍑忓垎鎬诲垎鏁版眹鎬�
- * @param totalSubScoreList
- */
- public void setTotalSubScoreList(List<BigDecimal> totalSubScoreList){
- this.totalSubScoreList = totalSubScoreList;
+ * 璁剧疆 缁撴潫 鏃�
+ * @param dayEnd
+ */
+ public void setDayEnd(Integer dayEnd){
+ this.dayEnd = dayEnd;
}
/**
- * 鑾峰彇 鍛樺伐缁╂晥鍑忓垎鎬诲垎鏁版眹鎬�
- * @return totalSubScoreNotList
- */
- public List<BigDecimal> getTotalSubScoreNotList(){
- return this.totalSubScoreNotList;
+ * 鑾峰彇 澧炲姞 鏃�
+ * @return dayIncrement
+ */
+ public Integer getDayIncrement(){
+ return this.dayIncrement;
}
/**
- * 璁剧疆 鍛樺伐缁╂晥鍑忓垎鎬诲垎鏁版眹鎬�
- * @param totalSubScoreNotList
- */
- public void setTotalSubScoreNotList(List<BigDecimal> totalSubScoreNotList){
- this.totalSubScoreNotList = totalSubScoreNotList;
+ * 璁剧疆 澧炲姞 鏃�
+ * @param dayIncrement
+ */
+ public void setDayIncrement(Integer dayIncrement){
+ this.dayIncrement = dayIncrement;
}
-
/**
- * 鑾峰彇 寮€濮� 鎶曡瘔缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @return complainScoreAddStart
- */
- public BigDecimal getComplainScoreAddStart(){
- return this.complainScoreAddStart;
+ * 鑾峰彇 鏃�
+ * @return dayList
+ */
+ public List<Integer> getDayList(){
+ return this.dayList;
}
/**
- * 璁剧疆 寮€濮� 鎶曡瘔缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @param complainScoreAddStart
- */
- public void setComplainScoreAddStart(BigDecimal complainScoreAddStart){
- this.complainScoreAddStart = complainScoreAddStart;
+ * 璁剧疆 鏃�
+ * @param dayList
+ */
+ public void setDayList(List<Integer> dayList){
+ this.dayList = dayList;
}
/**
- * 鑾峰彇 缁撴潫 鎶曡瘔缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @return $complainScoreAddEnd
- */
- public BigDecimal getComplainScoreAddEnd(){
- return this.complainScoreAddEnd;
+ * 鑾峰彇 鏃�
+ * @return dayNotList
+ */
+ public List<Integer> getDayNotList(){
+ return this.dayNotList;
}
/**
- * 璁剧疆 缁撴潫 鎶曡瘔缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @param complainScoreAddEnd
- */
- public void setComplainScoreAddEnd(BigDecimal complainScoreAddEnd){
- this.complainScoreAddEnd = complainScoreAddEnd;
+ * 璁剧疆 鏃�
+ * @param dayNotList
+ */
+ public void setDayNotList(List<Integer> dayNotList){
+ this.dayNotList = dayNotList;
}
+
/**
- * 鑾峰彇 澧炲姞 鎶曡瘔缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @return complainScoreAddIncrement
- */
- public BigDecimal getComplainScoreAddIncrement(){
- return this.complainScoreAddIncrement;
+ * 鑾峰彇 寮€濮� 鍒涘缓鏃堕棿
+ * @return createTimeStart
+ */
+ public String getCreateTimeStart(){
+ return this.createTimeStart;
}
/**
- * 璁剧疆 澧炲姞 鎶曡瘔缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @param complainScoreAddIncrement
- */
- public void setComplainScoreAddIncrement(BigDecimal complainScoreAddIncrement){
- this.complainScoreAddIncrement = complainScoreAddIncrement;
+ * 璁剧疆 寮€濮� 鍒涘缓鏃堕棿
+ * @param createTimeStart
+ */
+ public void setCreateTimeStart(String createTimeStart){
+ this.createTimeStart = createTimeStart;
}
/**
- * 鑾峰彇 鎶曡瘔缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @return complainScoreAddList
- */
- public List<BigDecimal> getComplainScoreAddList(){
- return this.complainScoreAddList;
+ * 鑾峰彇 缁撴潫 鍒涘缓鏃堕棿
+ * @return createTimeEnd
+ */
+ public String getCreateTimeEnd(){
+ return this.createTimeEnd;
}
/**
- * 璁剧疆 鎶曡瘔缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @param complainScoreAddList
- */
- public void setComplainScoreAddList(List<BigDecimal> complainScoreAddList){
- this.complainScoreAddList = complainScoreAddList;
+ * 璁剧疆 缁撴潫 鍒涘缓鏃堕棿
+ * @param createTimeEnd
+ */
+ public void setCreateTimeEnd(String createTimeEnd){
+ this.createTimeEnd = createTimeEnd;
}
/**
- * 鑾峰彇 鎶曡瘔缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @return complainScoreAddNotList
- */
- public List<BigDecimal> getComplainScoreAddNotList(){
- return this.complainScoreAddNotList;
+ * 鑾峰彇 寮€濮� 鍒涘缓浜篿d
+ * @return createUserIdStart
+ */
+ public Long getCreateUserIdStart(){
+ return this.createUserIdStart;
}
/**
- * 璁剧疆 鎶曡瘔缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @param complainScoreAddNotList
- */
- public void setComplainScoreAddNotList(List<BigDecimal> complainScoreAddNotList){
- this.complainScoreAddNotList = complainScoreAddNotList;
+ * 璁剧疆 寮€濮� 鍒涘缓浜篿d
+ * @param createUserIdStart
+ */
+ public void setCreateUserIdStart(Long createUserIdStart){
+ this.createUserIdStart = createUserIdStart;
}
-
/**
- * 鑾峰彇 寮€濮� 鎶曡瘔缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @return complainScoreSubStart
- */
- public BigDecimal getComplainScoreSubStart(){
- return this.complainScoreSubStart;
+ * 鑾峰彇 缁撴潫 鍒涘缓浜篿d
+ * @return $createUserIdEnd
+ */
+ public Long getCreateUserIdEnd(){
+ return this.createUserIdEnd;
}
/**
- * 璁剧疆 寮€濮� 鎶曡瘔缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @param complainScoreSubStart
- */
- public void setComplainScoreSubStart(BigDecimal complainScoreSubStart){
- this.complainScoreSubStart = complainScoreSubStart;
+ * 璁剧疆 缁撴潫 鍒涘缓浜篿d
+ * @param createUserIdEnd
+ */
+ public void setCreateUserIdEnd(Long createUserIdEnd){
+ this.createUserIdEnd = createUserIdEnd;
}
/**
- * 鑾峰彇 缁撴潫 鎶曡瘔缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @return $complainScoreSubEnd
- */
- public BigDecimal getComplainScoreSubEnd(){
- return this.complainScoreSubEnd;
+ * 鑾峰彇 澧炲姞 鍒涘缓浜篿d
+ * @return createUserIdIncrement
+ */
+ public Long getCreateUserIdIncrement(){
+ return this.createUserIdIncrement;
}
/**
- * 璁剧疆 缁撴潫 鎶曡瘔缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @param complainScoreSubEnd
- */
- public void setComplainScoreSubEnd(BigDecimal complainScoreSubEnd){
- this.complainScoreSubEnd = complainScoreSubEnd;
+ * 璁剧疆 澧炲姞 鍒涘缓浜篿d
+ * @param createUserIdIncrement
+ */
+ public void setCreateUserIdIncrement(Long createUserIdIncrement){
+ this.createUserIdIncrement = createUserIdIncrement;
}
/**
- * 鑾峰彇 澧炲姞 鎶曡瘔缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @return complainScoreSubIncrement
- */
- public BigDecimal getComplainScoreSubIncrement(){
- return this.complainScoreSubIncrement;
+ * 鑾峰彇 鍒涘缓浜篿d
+ * @return createUserIdList
+ */
+ public List<Long> getCreateUserIdList(){
+ return this.createUserIdList;
}
/**
- * 璁剧疆 澧炲姞 鎶曡瘔缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @param complainScoreSubIncrement
- */
- public void setComplainScoreSubIncrement(BigDecimal complainScoreSubIncrement){
- this.complainScoreSubIncrement = complainScoreSubIncrement;
+ * 璁剧疆 鍒涘缓浜篿d
+ * @param createUserIdList
+ */
+ public void setCreateUserIdList(List<Long> createUserIdList){
+ this.createUserIdList = createUserIdList;
}
/**
- * 鑾峰彇 鎶曡瘔缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @return complainScoreSubList
- */
- public List<BigDecimal> getComplainScoreSubList(){
- return this.complainScoreSubList;
+ * 鑾峰彇 鍒涘缓浜篿d
+ * @return createUserIdNotList
+ */
+ public List<Long> getCreateUserIdNotList(){
+ return this.createUserIdNotList;
}
/**
- * 璁剧疆 鎶曡瘔缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @param complainScoreSubList
- */
- public void setComplainScoreSubList(List<BigDecimal> complainScoreSubList){
- this.complainScoreSubList = complainScoreSubList;
+ * 璁剧疆 鍒涘缓浜篿d
+ * @param createUserIdNotList
+ */
+ public void setCreateUserIdNotList(List<Long> createUserIdNotList){
+ this.createUserIdNotList = createUserIdNotList;
}
+
/**
- * 鑾峰彇 鎶曡瘔缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @return complainScoreSubNotList
- */
- public List<BigDecimal> getComplainScoreSubNotList(){
- return this.complainScoreSubNotList;
+ * 鑾峰彇 寮€濮� 鏇存柊鏃堕棿
+ * @return updateTimeStart
+ */
+ public String getUpdateTimeStart(){
+ return this.updateTimeStart;
}
/**
- * 璁剧疆 鎶曡瘔缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @param complainScoreSubNotList
- */
- public void setComplainScoreSubNotList(List<BigDecimal> complainScoreSubNotList){
- this.complainScoreSubNotList = complainScoreSubNotList;
+ * 璁剧疆 寮€濮� 鏇存柊鏃堕棿
+ * @param updateTimeStart
+ */
+ public void setUpdateTimeStart(String updateTimeStart){
+ this.updateTimeStart = updateTimeStart;
}
-
/**
- * 璁剧疆 涓婚敭ID锛屼富閿紝鑷闀�
- * @param id
- */
- public StaffPerformStatQuery id(Long id){
- setId(id);
- return this;
- }
-
- /**
- * 璁剧疆 寮€濮� 涓婚敭ID锛屼富閿紝鑷闀�
- * @param idStart
- */
- public StaffPerformStatQuery idStart(Long idStart){
- this.idStart = idStart;
- return this;
+ * 鑾峰彇 缁撴潫 鏇存柊鏃堕棿
+ * @return updateTimeEnd
+ */
+ public String getUpdateTimeEnd(){
+ return this.updateTimeEnd;
}
/**
- * 璁剧疆 缁撴潫 涓婚敭ID锛屼富閿紝鑷闀�
- * @param idEnd
- */
- public StaffPerformStatQuery idEnd(Long idEnd){
- this.idEnd = idEnd;
- return this;
+ * 璁剧疆 缁撴潫 鏇存柊鏃堕棿
+ * @param updateTimeEnd
+ */
+ public void setUpdateTimeEnd(String updateTimeEnd){
+ this.updateTimeEnd = updateTimeEnd;
}
/**
- * 璁剧疆 澧炲姞 涓婚敭ID锛屼富閿紝鑷闀�
- * @param idIncrement
- */
- public StaffPerformStatQuery idIncrement(Long idIncrement){
- this.idIncrement = idIncrement;
- return this;
+ * 鑾峰彇 寮€濮� 鏇存柊浜篿d
+ * @return updateUserIdStart
+ */
+ public Long getUpdateUserIdStart(){
+ return this.updateUserIdStart;
}
/**
- * 璁剧疆 涓婚敭ID锛屼富閿紝鑷闀�
- * @param idList
- */
- public StaffPerformStatQuery idList(List<Long> idList){
- this.idList = idList;
- return this;
- }
-
- /**
- * 璁剧疆 涓婚敭ID锛屼富閿紝鑷闀�
- * @param idNotList
- */
- public StaffPerformStatQuery idNotList(List<Long> idNotList){
- this.idNotList = idNotList;
- return this;
- }
+ * 璁剧疆 寮€濮� 鏇存柊浜篿d
+ * @param updateUserIdStart
+ */
+ public void setUpdateUserIdStart(Long updateUserIdStart){
+ this.updateUserIdStart = updateUserIdStart;
+ }
/**
- * 璁剧疆 閮ㄩ棬id鍙�
- * @param deptId
- */
- public StaffPerformStatQuery deptId(Long deptId){
- setDeptId(deptId);
- return this;
- }
-
- /**
- * 璁剧疆 寮€濮� 閮ㄩ棬id鍙�
- * @param deptIdStart
- */
- public StaffPerformStatQuery deptIdStart(Long deptIdStart){
- this.deptIdStart = deptIdStart;
- return this;
+ * 鑾峰彇 缁撴潫 鏇存柊浜篿d
+ * @return $updateUserIdEnd
+ */
+ public Long getUpdateUserIdEnd(){
+ return this.updateUserIdEnd;
}
/**
- * 璁剧疆 缁撴潫 閮ㄩ棬id鍙�
- * @param deptIdEnd
- */
- public StaffPerformStatQuery deptIdEnd(Long deptIdEnd){
- this.deptIdEnd = deptIdEnd;
- return this;
+ * 璁剧疆 缁撴潫 鏇存柊浜篿d
+ * @param updateUserIdEnd
+ */
+ public void setUpdateUserIdEnd(Long updateUserIdEnd){
+ this.updateUserIdEnd = updateUserIdEnd;
}
/**
- * 璁剧疆 澧炲姞 閮ㄩ棬id鍙�
- * @param deptIdIncrement
- */
- public StaffPerformStatQuery deptIdIncrement(Long deptIdIncrement){
- this.deptIdIncrement = deptIdIncrement;
- return this;
+ * 鑾峰彇 澧炲姞 鏇存柊浜篿d
+ * @return updateUserIdIncrement
+ */
+ public Long getUpdateUserIdIncrement(){
+ return this.updateUserIdIncrement;
}
/**
- * 璁剧疆 閮ㄩ棬id鍙�
- * @param deptIdList
- */
- public StaffPerformStatQuery deptIdList(List<Long> deptIdList){
- this.deptIdList = deptIdList;
- return this;
- }
-
- /**
- * 璁剧疆 閮ㄩ棬id鍙�
- * @param deptIdNotList
- */
- public StaffPerformStatQuery deptIdNotList(List<Long> deptIdNotList){
- this.deptIdNotList = deptIdNotList;
- return this;
- }
-
-
- /**
- * 璁剧疆 閮ㄩ棬鍚嶇О
- * @param deptName
- */
- public StaffPerformStatQuery deptName(String deptName){
- setDeptName(deptName);
- return this;
+ * 璁剧疆 澧炲姞 鏇存柊浜篿d
+ * @param updateUserIdIncrement
+ */
+ public void setUpdateUserIdIncrement(Long updateUserIdIncrement){
+ this.updateUserIdIncrement = updateUserIdIncrement;
}
/**
- * 璁剧疆 閮ㄩ棬鍚嶇О
- * @param deptNameList
- */
- public StaffPerformStatQuery deptNameList(List<String> deptNameList){
- this.deptNameList = deptNameList;
- return this;
+ * 鑾峰彇 鏇存柊浜篿d
+ * @return updateUserIdList
+ */
+ public List<Long> getUpdateUserIdList(){
+ return this.updateUserIdList;
}
/**
- * 璁剧疆 鍛樺伐缁╂晥鎬诲垎鏁�
- * @param totalScore
- */
- public StaffPerformStatQuery totalScore(BigDecimal totalScore){
- setTotalScore(totalScore);
- return this;
- }
-
- /**
- * 璁剧疆 寮€濮� 鍛樺伐缁╂晥鎬诲垎鏁�
- * @param totalScoreStart
- */
- public StaffPerformStatQuery totalScoreStart(BigDecimal totalScoreStart){
- this.totalScoreStart = totalScoreStart;
- return this;
+ * 璁剧疆 鏇存柊浜篿d
+ * @param updateUserIdList
+ */
+ public void setUpdateUserIdList(List<Long> updateUserIdList){
+ this.updateUserIdList = updateUserIdList;
}
/**
- * 璁剧疆 缁撴潫 鍛樺伐缁╂晥鎬诲垎鏁�
- * @param totalScoreEnd
- */
- public StaffPerformStatQuery totalScoreEnd(BigDecimal totalScoreEnd){
- this.totalScoreEnd = totalScoreEnd;
- return this;
+ * 鑾峰彇 鏇存柊浜篿d
+ * @return updateUserIdNotList
+ */
+ public List<Long> getUpdateUserIdNotList(){
+ return this.updateUserIdNotList;
}
/**
- * 璁剧疆 澧炲姞 鍛樺伐缁╂晥鎬诲垎鏁�
- * @param totalScoreIncrement
- */
- public StaffPerformStatQuery totalScoreIncrement(BigDecimal totalScoreIncrement){
- this.totalScoreIncrement = totalScoreIncrement;
- return this;
+ * 璁剧疆 鏇存柊浜篿d
+ * @param updateUserIdNotList
+ */
+ public void setUpdateUserIdNotList(List<Long> updateUserIdNotList){
+ this.updateUserIdNotList = updateUserIdNotList;
}
+
/**
- * 璁剧疆 鍛樺伐缁╂晥鎬诲垎鏁�
- * @param totalScoreList
- */
- public StaffPerformStatQuery totalScoreList(List<BigDecimal> totalScoreList){
- this.totalScoreList = totalScoreList;
- return this;
- }
-
- /**
- * 璁剧疆 鍛樺伐缁╂晥鎬诲垎鏁�
- * @param totalScoreNotList
- */
- public StaffPerformStatQuery totalScoreNotList(List<BigDecimal> totalScoreNotList){
- this.totalScoreNotList = totalScoreNotList;
+ * 璁剧疆 涓婚敭ID锛屼富閿紝鑷闀�
+ * @param id
+ */
+ public StaffPerformStatQuery id(Long id){
+ setId(id);
return this;
- }
-
-
- /**
- * 璁剧疆 澶囨敞
- * @param remark
- */
- public StaffPerformStatQuery remark(String remark){
- setRemark(remark);
- return this;
}
/**
- * 璁剧疆 澶囨敞
- * @param remarkList
- */
- public StaffPerformStatQuery remarkList(List<String> remarkList){
- this.remarkList = remarkList;
- return this;
+ * 璁剧疆 寮€濮� 涓婚敭ID锛屼富閿紝鑷闀�
+ * @param idStart
+ */
+ public StaffPerformStatQuery idStart(Long idStart){
+ this.idStart = idStart;
+ return this;
}
/**
- * 璁剧疆 骞�
- * @param year
- */
- public StaffPerformStatQuery year(Integer year){
- setYear(year);
- return this;
- }
-
- /**
- * 璁剧疆 寮€濮� 骞�
- * @param yearStart
- */
- public StaffPerformStatQuery yearStart(Integer yearStart){
- this.yearStart = yearStart;
- return this;
+ * 璁剧疆 缁撴潫 涓婚敭ID锛屼富閿紝鑷闀�
+ * @param idEnd
+ */
+ public StaffPerformStatQuery idEnd(Long idEnd){
+ this.idEnd = idEnd;
+ return this;
}
/**
- * 璁剧疆 缁撴潫 骞�
- * @param yearEnd
- */
- public StaffPerformStatQuery yearEnd(Integer yearEnd){
- this.yearEnd = yearEnd;
- return this;
+ * 璁剧疆 澧炲姞 涓婚敭ID锛屼富閿紝鑷闀�
+ * @param idIncrement
+ */
+ public StaffPerformStatQuery idIncrement(Long idIncrement){
+ this.idIncrement = idIncrement;
+ return this;
}
/**
- * 璁剧疆 澧炲姞 骞�
- * @param yearIncrement
- */
- public StaffPerformStatQuery yearIncrement(Integer yearIncrement){
- this.yearIncrement = yearIncrement;
- return this;
+ * 璁剧疆 涓婚敭ID锛屼富閿紝鑷闀�
+ * @param idList
+ */
+ public StaffPerformStatQuery idList(List<Long> idList){
+ this.idList = idList;
+ return this;
}
/**
- * 璁剧疆 骞�
- * @param yearList
- */
- public StaffPerformStatQuery yearList(List<Integer> yearList){
- this.yearList = yearList;
- return this;
- }
-
- /**
- * 璁剧疆 骞�
- * @param yearNotList
- */
- public StaffPerformStatQuery yearNotList(List<Integer> yearNotList){
- this.yearNotList = yearNotList;
+ * 璁剧疆 涓婚敭ID锛屼富閿紝鑷闀�
+ * @param idNotList
+ */
+ public StaffPerformStatQuery idNotList(List<Long> idNotList){
+ this.idNotList = idNotList;
return this;
- }
-
- /**
- * 璁剧疆 鏈�
- * @param month
- */
- public StaffPerformStatQuery month(Integer month){
- setMonth(month);
- return this;
- }
-
- /**
- * 璁剧疆 寮€濮� 鏈�
- * @param monthStart
- */
- public StaffPerformStatQuery monthStart(Integer monthStart){
- this.monthStart = monthStart;
- return this;
}
/**
- * 璁剧疆 缁撴潫 鏈�
- * @param monthEnd
- */
- public StaffPerformStatQuery monthEnd(Integer monthEnd){
- this.monthEnd = monthEnd;
- return this;
+ * 璁剧疆 閮ㄩ棬id鍙�
+ * @param staffId
+ */
+ public StaffPerformStatQuery staffId(Long staffId){
+ setStaffId(staffId);
+ return this;
}
/**
- * 璁剧疆 澧炲姞 鏈�
- * @param monthIncrement
- */
- public StaffPerformStatQuery monthIncrement(Integer monthIncrement){
- this.monthIncrement = monthIncrement;
- return this;
+ * 璁剧疆 寮€濮� 閮ㄩ棬id鍙�
+ * @param staffIdStart
+ */
+ public StaffPerformStatQuery staffIdStart(Long staffIdStart){
+ this.staffIdStart = staffIdStart;
+ return this;
}
/**
- * 璁剧疆 鏈�
- * @param monthList
- */
- public StaffPerformStatQuery monthList(List<Integer> monthList){
- this.monthList = monthList;
- return this;
- }
-
- /**
- * 璁剧疆 鏈�
- * @param monthNotList
- */
- public StaffPerformStatQuery monthNotList(List<Integer> monthNotList){
- this.monthNotList = monthNotList;
+ * 璁剧疆 缁撴潫 閮ㄩ棬id鍙�
+ * @param staffIdEnd
+ */
+ public StaffPerformStatQuery staffIdEnd(Long staffIdEnd){
+ this.staffIdEnd = staffIdEnd;
return this;
- }
-
-
- /**
- * 璁剧疆 鍒涘缓浜篿d
- * @param createUserId
- */
- public StaffPerformStatQuery createUserId(Long createUserId){
- setCreateUserId(createUserId);
- return this;
- }
-
- /**
- * 璁剧疆 寮€濮� 鍒涘缓浜篿d
- * @param createUserIdStart
- */
- public StaffPerformStatQuery createUserIdStart(Long createUserIdStart){
- this.createUserIdStart = createUserIdStart;
- return this;
}
/**
- * 璁剧疆 缁撴潫 鍒涘缓浜篿d
- * @param createUserIdEnd
- */
- public StaffPerformStatQuery createUserIdEnd(Long createUserIdEnd){
- this.createUserIdEnd = createUserIdEnd;
- return this;
+ * 璁剧疆 澧炲姞 閮ㄩ棬id鍙�
+ * @param staffIdIncrement
+ */
+ public StaffPerformStatQuery staffIdIncrement(Long staffIdIncrement){
+ this.staffIdIncrement = staffIdIncrement;
+ return this;
}
/**
- * 璁剧疆 澧炲姞 鍒涘缓浜篿d
- * @param createUserIdIncrement
- */
- public StaffPerformStatQuery createUserIdIncrement(Long createUserIdIncrement){
- this.createUserIdIncrement = createUserIdIncrement;
- return this;
+ * 璁剧疆 閮ㄩ棬id鍙�
+ * @param staffIdList
+ */
+ public StaffPerformStatQuery staffIdList(List<Long> staffIdList){
+ this.staffIdList = staffIdList;
+ return this;
}
/**
- * 璁剧疆 鍒涘缓浜篿d
- * @param createUserIdList
- */
- public StaffPerformStatQuery createUserIdList(List<Long> createUserIdList){
- this.createUserIdList = createUserIdList;
- return this;
- }
-
- /**
- * 璁剧疆 鍒涘缓浜篿d
- * @param createUserIdNotList
- */
- public StaffPerformStatQuery createUserIdNotList(List<Long> createUserIdNotList){
- this.createUserIdNotList = createUserIdNotList;
+ * 璁剧疆 閮ㄩ棬id鍙�
+ * @param staffIdNotList
+ */
+ public StaffPerformStatQuery staffIdNotList(List<Long> staffIdNotList){
+ this.staffIdNotList = staffIdNotList;
return this;
- }
+ }
/**
- * 璁剧疆 鏇存柊浜篿d
- * @param updateUserId
- */
- public StaffPerformStatQuery updateUserId(Long updateUserId){
- setUpdateUserId(updateUserId);
- return this;
- }
-
- /**
- * 璁剧疆 寮€濮� 鏇存柊浜篿d
- * @param updateUserIdStart
- */
- public StaffPerformStatQuery updateUserIdStart(Long updateUserIdStart){
- this.updateUserIdStart = updateUserIdStart;
- return this;
+ * 璁剧疆 閮ㄩ棬鍚嶇О
+ * @param staffName
+ */
+ public StaffPerformStatQuery staffName(String staffName){
+ setStaffName(staffName);
+ return this;
}
/**
- * 璁剧疆 缁撴潫 鏇存柊浜篿d
- * @param updateUserIdEnd
- */
- public StaffPerformStatQuery updateUserIdEnd(Long updateUserIdEnd){
- this.updateUserIdEnd = updateUserIdEnd;
- return this;
+ * 璁剧疆 閮ㄩ棬鍚嶇О
+ * @param staffNameList
+ */
+ public StaffPerformStatQuery staffNameList(List<String> staffNameList){
+ this.staffNameList = staffNameList;
+ return this;
}
/**
- * 璁剧疆 澧炲姞 鏇存柊浜篿d
- * @param updateUserIdIncrement
- */
- public StaffPerformStatQuery updateUserIdIncrement(Long updateUserIdIncrement){
- this.updateUserIdIncrement = updateUserIdIncrement;
- return this;
+ * 璁剧疆 鍛樺伐缁╂晥鎬诲垎鏁�
+ * @param totalScore
+ */
+ public StaffPerformStatQuery totalScore(BigDecimal totalScore){
+ setTotalScore(totalScore);
+ return this;
}
/**
- * 璁剧疆 鏇存柊浜篿d
- * @param updateUserIdList
- */
- public StaffPerformStatQuery updateUserIdList(List<Long> updateUserIdList){
- this.updateUserIdList = updateUserIdList;
- return this;
- }
-
- /**
- * 璁剧疆 鏇存柊浜篿d
- * @param updateUserIdNotList
- */
- public StaffPerformStatQuery updateUserIdNotList(List<Long> updateUserIdNotList){
- this.updateUserIdNotList = updateUserIdNotList;
+ * 璁剧疆 寮€濮� 鍛樺伐缁╂晥鎬诲垎鏁�
+ * @param totalScoreStart
+ */
+ public StaffPerformStatQuery totalScoreStart(BigDecimal totalScoreStart){
+ this.totalScoreStart = totalScoreStart;
return this;
- }
+ }
/**
- * 璁剧疆 鑰冨嫟缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @param attendScoreAdd
- */
- public StaffPerformStatQuery attendScoreAdd(BigDecimal attendScoreAdd){
- setAttendScoreAdd(attendScoreAdd);
- return this;
- }
-
- /**
- * 璁剧疆 寮€濮� 鑰冨嫟缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @param attendScoreAddStart
- */
- public StaffPerformStatQuery attendScoreAddStart(BigDecimal attendScoreAddStart){
- this.attendScoreAddStart = attendScoreAddStart;
- return this;
+ * 璁剧疆 缁撴潫 鍛樺伐缁╂晥鎬诲垎鏁�
+ * @param totalScoreEnd
+ */
+ public StaffPerformStatQuery totalScoreEnd(BigDecimal totalScoreEnd){
+ this.totalScoreEnd = totalScoreEnd;
+ return this;
}
/**
- * 璁剧疆 缁撴潫 鑰冨嫟缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @param attendScoreAddEnd
- */
- public StaffPerformStatQuery attendScoreAddEnd(BigDecimal attendScoreAddEnd){
- this.attendScoreAddEnd = attendScoreAddEnd;
- return this;
+ * 璁剧疆 澧炲姞 鍛樺伐缁╂晥鎬诲垎鏁�
+ * @param totalScoreIncrement
+ */
+ public StaffPerformStatQuery totalScoreIncrement(BigDecimal totalScoreIncrement){
+ this.totalScoreIncrement = totalScoreIncrement;
+ return this;
}
/**
- * 璁剧疆 澧炲姞 鑰冨嫟缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @param attendScoreAddIncrement
- */
- public StaffPerformStatQuery attendScoreAddIncrement(BigDecimal attendScoreAddIncrement){
- this.attendScoreAddIncrement = attendScoreAddIncrement;
- return this;
+ * 璁剧疆 鍛樺伐缁╂晥鎬诲垎鏁�
+ * @param totalScoreList
+ */
+ public StaffPerformStatQuery totalScoreList(List<BigDecimal> totalScoreList){
+ this.totalScoreList = totalScoreList;
+ return this;
}
/**
- * 璁剧疆 鑰冨嫟缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @param attendScoreAddList
- */
- public StaffPerformStatQuery attendScoreAddList(List<BigDecimal> attendScoreAddList){
- this.attendScoreAddList = attendScoreAddList;
- return this;
- }
-
- /**
- * 璁剧疆 鑰冨嫟缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @param attendScoreAddNotList
- */
- public StaffPerformStatQuery attendScoreAddNotList(List<BigDecimal> attendScoreAddNotList){
- this.attendScoreAddNotList = attendScoreAddNotList;
+ * 璁剧疆 鍛樺伐缁╂晥鎬诲垎鏁�
+ * @param totalScoreNotList
+ */
+ public StaffPerformStatQuery totalScoreNotList(List<BigDecimal> totalScoreNotList){
+ this.totalScoreNotList = totalScoreNotList;
return this;
- }
+ }
/**
- * 璁剧疆 鑰冨嫟缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @param attendScoreSub
- */
- public StaffPerformStatQuery attendScoreSub(BigDecimal attendScoreSub){
- setAttendScoreSub(attendScoreSub);
- return this;
- }
-
- /**
- * 璁剧疆 寮€濮� 鑰冨嫟缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @param attendScoreSubStart
- */
- public StaffPerformStatQuery attendScoreSubStart(BigDecimal attendScoreSubStart){
- this.attendScoreSubStart = attendScoreSubStart;
- return this;
+ * 璁剧疆 鍛樺伐缁╂晥鍔犲垎鎬诲垎鏁版眹鎬�
+ * @param totalAddScore
+ */
+ public StaffPerformStatQuery totalAddScore(BigDecimal totalAddScore){
+ setTotalAddScore(totalAddScore);
+ return this;
}
/**
- * 璁剧疆 缁撴潫 鑰冨嫟缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @param attendScoreSubEnd
- */
- public StaffPerformStatQuery attendScoreSubEnd(BigDecimal attendScoreSubEnd){
- this.attendScoreSubEnd = attendScoreSubEnd;
- return this;
+ * 璁剧疆 寮€濮� 鍛樺伐缁╂晥鍔犲垎鎬诲垎鏁版眹鎬�
+ * @param totalAddScoreStart
+ */
+ public StaffPerformStatQuery totalAddScoreStart(BigDecimal totalAddScoreStart){
+ this.totalAddScoreStart = totalAddScoreStart;
+ return this;
}
/**
- * 璁剧疆 澧炲姞 鑰冨嫟缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @param attendScoreSubIncrement
- */
- public StaffPerformStatQuery attendScoreSubIncrement(BigDecimal attendScoreSubIncrement){
- this.attendScoreSubIncrement = attendScoreSubIncrement;
- return this;
+ * 璁剧疆 缁撴潫 鍛樺伐缁╂晥鍔犲垎鎬诲垎鏁版眹鎬�
+ * @param totalAddScoreEnd
+ */
+ public StaffPerformStatQuery totalAddScoreEnd(BigDecimal totalAddScoreEnd){
+ this.totalAddScoreEnd = totalAddScoreEnd;
+ return this;
}
/**
- * 璁剧疆 鑰冨嫟缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @param attendScoreSubList
- */
- public StaffPerformStatQuery attendScoreSubList(List<BigDecimal> attendScoreSubList){
- this.attendScoreSubList = attendScoreSubList;
- return this;
- }
-
- /**
- * 璁剧疆 鑰冨嫟缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @param attendScoreSubNotList
- */
- public StaffPerformStatQuery attendScoreSubNotList(List<BigDecimal> attendScoreSubNotList){
- this.attendScoreSubNotList = attendScoreSubNotList;
+ * 璁剧疆 澧炲姞 鍛樺伐缁╂晥鍔犲垎鎬诲垎鏁版眹鎬�
+ * @param totalAddScoreIncrement
+ */
+ public StaffPerformStatQuery totalAddScoreIncrement(BigDecimal totalAddScoreIncrement){
+ this.totalAddScoreIncrement = totalAddScoreIncrement;
return this;
- }
+ }
/**
- * 璁剧疆 璇勪环缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @param assessScoreAdd
- */
- public StaffPerformStatQuery assessScoreAdd(BigDecimal assessScoreAdd){
- setAssessScoreAdd(assessScoreAdd);
- return this;
- }
-
- /**
- * 璁剧疆 寮€濮� 璇勪环缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @param assessScoreAddStart
- */
- public StaffPerformStatQuery assessScoreAddStart(BigDecimal assessScoreAddStart){
- this.assessScoreAddStart = assessScoreAddStart;
- return this;
+ * 璁剧疆 鍛樺伐缁╂晥鍔犲垎鎬诲垎鏁版眹鎬�
+ * @param totalAddScoreList
+ */
+ public StaffPerformStatQuery totalAddScoreList(List<BigDecimal> totalAddScoreList){
+ this.totalAddScoreList = totalAddScoreList;
+ return this;
}
/**
- * 璁剧疆 缁撴潫 璇勪环缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @param assessScoreAddEnd
- */
- public StaffPerformStatQuery assessScoreAddEnd(BigDecimal assessScoreAddEnd){
- this.assessScoreAddEnd = assessScoreAddEnd;
- return this;
+ * 璁剧疆 鍛樺伐缁╂晥鍔犲垎鎬诲垎鏁版眹鎬�
+ * @param totalAddScoreNotList
+ */
+ public StaffPerformStatQuery totalAddScoreNotList(List<BigDecimal> totalAddScoreNotList){
+ this.totalAddScoreNotList = totalAddScoreNotList;
+ return this;
}
/**
- * 璁剧疆 澧炲姞 璇勪环缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @param assessScoreAddIncrement
- */
- public StaffPerformStatQuery assessScoreAddIncrement(BigDecimal assessScoreAddIncrement){
- this.assessScoreAddIncrement = assessScoreAddIncrement;
- return this;
+ * 璁剧疆 鍛樺伐缁╂晥鍑忓垎鎬诲垎鏁版眹鎬�
+ * @param totalSubScore
+ */
+ public StaffPerformStatQuery totalSubScore(BigDecimal totalSubScore){
+ setTotalSubScore(totalSubScore);
+ return this;
}
/**
- * 璁剧疆 璇勪环缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @param assessScoreAddList
- */
- public StaffPerformStatQuery assessScoreAddList(List<BigDecimal> assessScoreAddList){
- this.assessScoreAddList = assessScoreAddList;
- return this;
- }
-
- /**
- * 璁剧疆 璇勪环缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @param assessScoreAddNotList
- */
- public StaffPerformStatQuery assessScoreAddNotList(List<BigDecimal> assessScoreAddNotList){
- this.assessScoreAddNotList = assessScoreAddNotList;
+ * 璁剧疆 寮€濮� 鍛樺伐缁╂晥鍑忓垎鎬诲垎鏁版眹鎬�
+ * @param totalSubScoreStart
+ */
+ public StaffPerformStatQuery totalSubScoreStart(BigDecimal totalSubScoreStart){
+ this.totalSubScoreStart = totalSubScoreStart;
return this;
- }
+ }
/**
- * 璁剧疆 璇勪环缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @param assessScoreSub
- */
- public StaffPerformStatQuery assessScoreSub(BigDecimal assessScoreSub){
- setAssessScoreSub(assessScoreSub);
- return this;
- }
-
- /**
- * 璁剧疆 寮€濮� 璇勪环缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @param assessScoreSubStart
- */
- public StaffPerformStatQuery assessScoreSubStart(BigDecimal assessScoreSubStart){
- this.assessScoreSubStart = assessScoreSubStart;
- return this;
+ * 璁剧疆 缁撴潫 鍛樺伐缁╂晥鍑忓垎鎬诲垎鏁版眹鎬�
+ * @param totalSubScoreEnd
+ */
+ public StaffPerformStatQuery totalSubScoreEnd(BigDecimal totalSubScoreEnd){
+ this.totalSubScoreEnd = totalSubScoreEnd;
+ return this;
}
/**
- * 璁剧疆 缁撴潫 璇勪环缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @param assessScoreSubEnd
- */
- public StaffPerformStatQuery assessScoreSubEnd(BigDecimal assessScoreSubEnd){
- this.assessScoreSubEnd = assessScoreSubEnd;
- return this;
+ * 璁剧疆 澧炲姞 鍛樺伐缁╂晥鍑忓垎鎬诲垎鏁版眹鎬�
+ * @param totalSubScoreIncrement
+ */
+ public StaffPerformStatQuery totalSubScoreIncrement(BigDecimal totalSubScoreIncrement){
+ this.totalSubScoreIncrement = totalSubScoreIncrement;
+ return this;
}
/**
- * 璁剧疆 澧炲姞 璇勪环缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @param assessScoreSubIncrement
- */
- public StaffPerformStatQuery assessScoreSubIncrement(BigDecimal assessScoreSubIncrement){
- this.assessScoreSubIncrement = assessScoreSubIncrement;
- return this;
+ * 璁剧疆 鍛樺伐缁╂晥鍑忓垎鎬诲垎鏁版眹鎬�
+ * @param totalSubScoreList
+ */
+ public StaffPerformStatQuery totalSubScoreList(List<BigDecimal> totalSubScoreList){
+ this.totalSubScoreList = totalSubScoreList;
+ return this;
}
/**
- * 璁剧疆 璇勪环缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @param assessScoreSubList
- */
- public StaffPerformStatQuery assessScoreSubList(List<BigDecimal> assessScoreSubList){
- this.assessScoreSubList = assessScoreSubList;
- return this;
- }
-
- /**
- * 璁剧疆 璇勪环缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @param assessScoreSubNotList
- */
- public StaffPerformStatQuery assessScoreSubNotList(List<BigDecimal> assessScoreSubNotList){
- this.assessScoreSubNotList = assessScoreSubNotList;
+ * 璁剧疆 鍛樺伐缁╂晥鍑忓垎鎬诲垎鏁版眹鎬�
+ * @param totalSubScoreNotList
+ */
+ public StaffPerformStatQuery totalSubScoreNotList(List<BigDecimal> totalSubScoreNotList){
+ this.totalSubScoreNotList = totalSubScoreNotList;
return this;
- }
+ }
/**
- * 璁剧疆 鍔炰欢缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @param workScoreAdd
- */
- public StaffPerformStatQuery workScoreAdd(BigDecimal workScoreAdd){
- setWorkScoreAdd(workScoreAdd);
- return this;
- }
-
- /**
- * 璁剧疆 寮€濮� 鍔炰欢缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @param workScoreAddStart
- */
- public StaffPerformStatQuery workScoreAddStart(BigDecimal workScoreAddStart){
- this.workScoreAddStart = workScoreAddStart;
- return this;
+ * 璁剧疆 鑰冨嫟缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @param attendScoreAdd
+ */
+ public StaffPerformStatQuery attendScoreAdd(BigDecimal attendScoreAdd){
+ setAttendScoreAdd(attendScoreAdd);
+ return this;
}
/**
- * 璁剧疆 缁撴潫 鍔炰欢缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @param workScoreAddEnd
- */
- public StaffPerformStatQuery workScoreAddEnd(BigDecimal workScoreAddEnd){
- this.workScoreAddEnd = workScoreAddEnd;
- return this;
+ * 璁剧疆 寮€濮� 鑰冨嫟缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @param attendScoreAddStart
+ */
+ public StaffPerformStatQuery attendScoreAddStart(BigDecimal attendScoreAddStart){
+ this.attendScoreAddStart = attendScoreAddStart;
+ return this;
}
/**
- * 璁剧疆 澧炲姞 鍔炰欢缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @param workScoreAddIncrement
- */
- public StaffPerformStatQuery workScoreAddIncrement(BigDecimal workScoreAddIncrement){
- this.workScoreAddIncrement = workScoreAddIncrement;
- return this;
+ * 璁剧疆 缁撴潫 鑰冨嫟缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @param attendScoreAddEnd
+ */
+ public StaffPerformStatQuery attendScoreAddEnd(BigDecimal attendScoreAddEnd){
+ this.attendScoreAddEnd = attendScoreAddEnd;
+ return this;
}
/**
- * 璁剧疆 鍔炰欢缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @param workScoreAddList
- */
- public StaffPerformStatQuery workScoreAddList(List<BigDecimal> workScoreAddList){
- this.workScoreAddList = workScoreAddList;
- return this;
- }
-
- /**
- * 璁剧疆 鍔炰欢缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @param workScoreAddNotList
- */
- public StaffPerformStatQuery workScoreAddNotList(List<BigDecimal> workScoreAddNotList){
- this.workScoreAddNotList = workScoreAddNotList;
+ * 璁剧疆 澧炲姞 鑰冨嫟缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @param attendScoreAddIncrement
+ */
+ public StaffPerformStatQuery attendScoreAddIncrement(BigDecimal attendScoreAddIncrement){
+ this.attendScoreAddIncrement = attendScoreAddIncrement;
return this;
- }
+ }
/**
- * 璁剧疆 鍔炰欢缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @param workScoreSub
- */
- public StaffPerformStatQuery workScoreSub(BigDecimal workScoreSub){
- setWorkScoreSub(workScoreSub);
- return this;
- }
-
- /**
- * 璁剧疆 寮€濮� 鍔炰欢缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @param workScoreSubStart
- */
+ * 璁剧疆 鑰冨嫟缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @param attendScoreAddList
+ */
+ public StaffPerformStatQuery attendScoreAddList(List<BigDecimal> attendScoreAddList){
+ this.attendScoreAddList = attendScoreAddList;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鑰冨嫟缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @param attendScoreAddNotList
+ */
+ public StaffPerformStatQuery attendScoreAddNotList(List<BigDecimal> attendScoreAddNotList){
+ this.attendScoreAddNotList = attendScoreAddNotList;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鑰冨嫟缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @param attendScoreSub
+ */
+ public StaffPerformStatQuery attendScoreSub(BigDecimal attendScoreSub){
+ setAttendScoreSub(attendScoreSub);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 鑰冨嫟缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @param attendScoreSubStart
+ */
+ public StaffPerformStatQuery attendScoreSubStart(BigDecimal attendScoreSubStart){
+ this.attendScoreSubStart = attendScoreSubStart;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 缁撴潫 鑰冨嫟缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @param attendScoreSubEnd
+ */
+ public StaffPerformStatQuery attendScoreSubEnd(BigDecimal attendScoreSubEnd){
+ this.attendScoreSubEnd = attendScoreSubEnd;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 澧炲姞 鑰冨嫟缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @param attendScoreSubIncrement
+ */
+ public StaffPerformStatQuery attendScoreSubIncrement(BigDecimal attendScoreSubIncrement){
+ this.attendScoreSubIncrement = attendScoreSubIncrement;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鑰冨嫟缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @param attendScoreSubList
+ */
+ public StaffPerformStatQuery attendScoreSubList(List<BigDecimal> attendScoreSubList){
+ this.attendScoreSubList = attendScoreSubList;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鑰冨嫟缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @param attendScoreSubNotList
+ */
+ public StaffPerformStatQuery attendScoreSubNotList(List<BigDecimal> attendScoreSubNotList){
+ this.attendScoreSubNotList = attendScoreSubNotList;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 璇勪环缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @param assessScoreAdd
+ */
+ public StaffPerformStatQuery assessScoreAdd(BigDecimal assessScoreAdd){
+ setAssessScoreAdd(assessScoreAdd);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 璇勪环缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @param assessScoreAddStart
+ */
+ public StaffPerformStatQuery assessScoreAddStart(BigDecimal assessScoreAddStart){
+ this.assessScoreAddStart = assessScoreAddStart;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 缁撴潫 璇勪环缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @param assessScoreAddEnd
+ */
+ public StaffPerformStatQuery assessScoreAddEnd(BigDecimal assessScoreAddEnd){
+ this.assessScoreAddEnd = assessScoreAddEnd;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 澧炲姞 璇勪环缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @param assessScoreAddIncrement
+ */
+ public StaffPerformStatQuery assessScoreAddIncrement(BigDecimal assessScoreAddIncrement){
+ this.assessScoreAddIncrement = assessScoreAddIncrement;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 璇勪环缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @param assessScoreAddList
+ */
+ public StaffPerformStatQuery assessScoreAddList(List<BigDecimal> assessScoreAddList){
+ this.assessScoreAddList = assessScoreAddList;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 璇勪环缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @param assessScoreAddNotList
+ */
+ public StaffPerformStatQuery assessScoreAddNotList(List<BigDecimal> assessScoreAddNotList){
+ this.assessScoreAddNotList = assessScoreAddNotList;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 璇勪环缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @param assessScoreSub
+ */
+ public StaffPerformStatQuery assessScoreSub(BigDecimal assessScoreSub){
+ setAssessScoreSub(assessScoreSub);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 璇勪环缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @param assessScoreSubStart
+ */
+ public StaffPerformStatQuery assessScoreSubStart(BigDecimal assessScoreSubStart){
+ this.assessScoreSubStart = assessScoreSubStart;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 缁撴潫 璇勪环缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @param assessScoreSubEnd
+ */
+ public StaffPerformStatQuery assessScoreSubEnd(BigDecimal assessScoreSubEnd){
+ this.assessScoreSubEnd = assessScoreSubEnd;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 澧炲姞 璇勪环缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @param assessScoreSubIncrement
+ */
+ public StaffPerformStatQuery assessScoreSubIncrement(BigDecimal assessScoreSubIncrement){
+ this.assessScoreSubIncrement = assessScoreSubIncrement;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 璇勪环缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @param assessScoreSubList
+ */
+ public StaffPerformStatQuery assessScoreSubList(List<BigDecimal> assessScoreSubList){
+ this.assessScoreSubList = assessScoreSubList;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 璇勪环缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @param assessScoreSubNotList
+ */
+ public StaffPerformStatQuery assessScoreSubNotList(List<BigDecimal> assessScoreSubNotList){
+ this.assessScoreSubNotList = assessScoreSubNotList;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鎶曡瘔缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @param complainScoreAdd
+ */
+ public StaffPerformStatQuery complainScoreAdd(BigDecimal complainScoreAdd){
+ setComplainScoreAdd(complainScoreAdd);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 鎶曡瘔缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @param complainScoreAddStart
+ */
+ public StaffPerformStatQuery complainScoreAddStart(BigDecimal complainScoreAddStart){
+ this.complainScoreAddStart = complainScoreAddStart;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 缁撴潫 鎶曡瘔缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @param complainScoreAddEnd
+ */
+ public StaffPerformStatQuery complainScoreAddEnd(BigDecimal complainScoreAddEnd){
+ this.complainScoreAddEnd = complainScoreAddEnd;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 澧炲姞 鎶曡瘔缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @param complainScoreAddIncrement
+ */
+ public StaffPerformStatQuery complainScoreAddIncrement(BigDecimal complainScoreAddIncrement){
+ this.complainScoreAddIncrement = complainScoreAddIncrement;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鎶曡瘔缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @param complainScoreAddList
+ */
+ public StaffPerformStatQuery complainScoreAddList(List<BigDecimal> complainScoreAddList){
+ this.complainScoreAddList = complainScoreAddList;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鎶曡瘔缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @param complainScoreAddNotList
+ */
+ public StaffPerformStatQuery complainScoreAddNotList(List<BigDecimal> complainScoreAddNotList){
+ this.complainScoreAddNotList = complainScoreAddNotList;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鎶曡瘔缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @param complainScoreSub
+ */
+ public StaffPerformStatQuery complainScoreSub(BigDecimal complainScoreSub){
+ setComplainScoreSub(complainScoreSub);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 鎶曡瘔缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @param complainScoreSubStart
+ */
+ public StaffPerformStatQuery complainScoreSubStart(BigDecimal complainScoreSubStart){
+ this.complainScoreSubStart = complainScoreSubStart;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 缁撴潫 鎶曡瘔缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @param complainScoreSubEnd
+ */
+ public StaffPerformStatQuery complainScoreSubEnd(BigDecimal complainScoreSubEnd){
+ this.complainScoreSubEnd = complainScoreSubEnd;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 澧炲姞 鎶曡瘔缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @param complainScoreSubIncrement
+ */
+ public StaffPerformStatQuery complainScoreSubIncrement(BigDecimal complainScoreSubIncrement){
+ this.complainScoreSubIncrement = complainScoreSubIncrement;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鎶曡瘔缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @param complainScoreSubList
+ */
+ public StaffPerformStatQuery complainScoreSubList(List<BigDecimal> complainScoreSubList){
+ this.complainScoreSubList = complainScoreSubList;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鎶曡瘔缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @param complainScoreSubNotList
+ */
+ public StaffPerformStatQuery complainScoreSubNotList(List<BigDecimal> complainScoreSubNotList){
+ this.complainScoreSubNotList = complainScoreSubNotList;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鍔炰欢缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @param workScoreAdd
+ */
+ public StaffPerformStatQuery workScoreAdd(BigDecimal workScoreAdd){
+ setWorkScoreAdd(workScoreAdd);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 鍔炰欢缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @param workScoreAddStart
+ */
+ public StaffPerformStatQuery workScoreAddStart(BigDecimal workScoreAddStart){
+ this.workScoreAddStart = workScoreAddStart;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 缁撴潫 鍔炰欢缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @param workScoreAddEnd
+ */
+ public StaffPerformStatQuery workScoreAddEnd(BigDecimal workScoreAddEnd){
+ this.workScoreAddEnd = workScoreAddEnd;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 澧炲姞 鍔炰欢缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @param workScoreAddIncrement
+ */
+ public StaffPerformStatQuery workScoreAddIncrement(BigDecimal workScoreAddIncrement){
+ this.workScoreAddIncrement = workScoreAddIncrement;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鍔炰欢缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @param workScoreAddList
+ */
+ public StaffPerformStatQuery workScoreAddList(List<BigDecimal> workScoreAddList){
+ this.workScoreAddList = workScoreAddList;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鍔炰欢缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @param workScoreAddNotList
+ */
+ public StaffPerformStatQuery workScoreAddNotList(List<BigDecimal> workScoreAddNotList){
+ this.workScoreAddNotList = workScoreAddNotList;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鍔炰欢缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @param workScoreSub
+ */
+ public StaffPerformStatQuery workScoreSub(BigDecimal workScoreSub){
+ setWorkScoreSub(workScoreSub);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 鍔炰欢缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @param workScoreSubStart
+ */
public StaffPerformStatQuery workScoreSubStart(BigDecimal workScoreSubStart){
- this.workScoreSubStart = workScoreSubStart;
- return this;
+ this.workScoreSubStart = workScoreSubStart;
+ return this;
}
/**
- * 璁剧疆 缁撴潫 鍔炰欢缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @param workScoreSubEnd
- */
+ * 璁剧疆 缁撴潫 鍔炰欢缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @param workScoreSubEnd
+ */
public StaffPerformStatQuery workScoreSubEnd(BigDecimal workScoreSubEnd){
- this.workScoreSubEnd = workScoreSubEnd;
- return this;
+ this.workScoreSubEnd = workScoreSubEnd;
+ return this;
}
/**
- * 璁剧疆 澧炲姞 鍔炰欢缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @param workScoreSubIncrement
- */
+ * 璁剧疆 澧炲姞 鍔炰欢缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @param workScoreSubIncrement
+ */
public StaffPerformStatQuery workScoreSubIncrement(BigDecimal workScoreSubIncrement){
- this.workScoreSubIncrement = workScoreSubIncrement;
- return this;
+ this.workScoreSubIncrement = workScoreSubIncrement;
+ return this;
}
/**
- * 璁剧疆 鍔炰欢缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @param workScoreSubList
- */
+ * 璁剧疆 鍔炰欢缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @param workScoreSubList
+ */
public StaffPerformStatQuery workScoreSubList(List<BigDecimal> workScoreSubList){
this.workScoreSubList = workScoreSubList;
- return this;
- }
-
- /**
- * 璁剧疆 鍔炰欢缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @param workScoreSubNotList
- */
- public StaffPerformStatQuery workScoreSubNotList(List<BigDecimal> workScoreSubNotList){
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鍔炰欢缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @param workScoreSubNotList
+ */
+ public StaffPerformStatQuery workScoreSubNotList(List<BigDecimal> workScoreSubNotList){
this.workScoreSubNotList = workScoreSubNotList;
return this;
- }
+ }
/**
- * 璁剧疆 鏁堣兘缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @param effectScoreAdd
- */
+ * 璁剧疆 鏁堣兘缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @param effectScoreAdd
+ */
public StaffPerformStatQuery effectScoreAdd(BigDecimal effectScoreAdd){
- setEffectScoreAdd(effectScoreAdd);
- return this;
- }
-
- /**
- * 璁剧疆 寮€濮� 鏁堣兘缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @param effectScoreAddStart
- */
+ setEffectScoreAdd(effectScoreAdd);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 鏁堣兘缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @param effectScoreAddStart
+ */
public StaffPerformStatQuery effectScoreAddStart(BigDecimal effectScoreAddStart){
- this.effectScoreAddStart = effectScoreAddStart;
- return this;
+ this.effectScoreAddStart = effectScoreAddStart;
+ return this;
}
/**
- * 璁剧疆 缁撴潫 鏁堣兘缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @param effectScoreAddEnd
- */
+ * 璁剧疆 缁撴潫 鏁堣兘缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @param effectScoreAddEnd
+ */
public StaffPerformStatQuery effectScoreAddEnd(BigDecimal effectScoreAddEnd){
- this.effectScoreAddEnd = effectScoreAddEnd;
- return this;
+ this.effectScoreAddEnd = effectScoreAddEnd;
+ return this;
}
/**
- * 璁剧疆 澧炲姞 鏁堣兘缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @param effectScoreAddIncrement
- */
+ * 璁剧疆 澧炲姞 鏁堣兘缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @param effectScoreAddIncrement
+ */
public StaffPerformStatQuery effectScoreAddIncrement(BigDecimal effectScoreAddIncrement){
- this.effectScoreAddIncrement = effectScoreAddIncrement;
- return this;
+ this.effectScoreAddIncrement = effectScoreAddIncrement;
+ return this;
}
/**
- * 璁剧疆 鏁堣兘缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @param effectScoreAddList
- */
+ * 璁剧疆 鏁堣兘缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @param effectScoreAddList
+ */
public StaffPerformStatQuery effectScoreAddList(List<BigDecimal> effectScoreAddList){
this.effectScoreAddList = effectScoreAddList;
- return this;
- }
-
- /**
- * 璁剧疆 鏁堣兘缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @param effectScoreAddNotList
- */
- public StaffPerformStatQuery effectScoreAddNotList(List<BigDecimal> effectScoreAddNotList){
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鏁堣兘缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @param effectScoreAddNotList
+ */
+ public StaffPerformStatQuery effectScoreAddNotList(List<BigDecimal> effectScoreAddNotList){
this.effectScoreAddNotList = effectScoreAddNotList;
return this;
- }
+ }
/**
- * 璁剧疆 鏁堣兘缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @param effectScoreSub
- */
+ * 璁剧疆 鏁堣兘缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @param effectScoreSub
+ */
public StaffPerformStatQuery effectScoreSub(BigDecimal effectScoreSub){
- setEffectScoreSub(effectScoreSub);
- return this;
- }
-
- /**
- * 璁剧疆 寮€濮� 鏁堣兘缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @param effectScoreSubStart
- */
+ setEffectScoreSub(effectScoreSub);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 鏁堣兘缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @param effectScoreSubStart
+ */
public StaffPerformStatQuery effectScoreSubStart(BigDecimal effectScoreSubStart){
- this.effectScoreSubStart = effectScoreSubStart;
- return this;
+ this.effectScoreSubStart = effectScoreSubStart;
+ return this;
}
/**
- * 璁剧疆 缁撴潫 鏁堣兘缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @param effectScoreSubEnd
- */
+ * 璁剧疆 缁撴潫 鏁堣兘缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @param effectScoreSubEnd
+ */
public StaffPerformStatQuery effectScoreSubEnd(BigDecimal effectScoreSubEnd){
- this.effectScoreSubEnd = effectScoreSubEnd;
- return this;
+ this.effectScoreSubEnd = effectScoreSubEnd;
+ return this;
}
/**
- * 璁剧疆 澧炲姞 鏁堣兘缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @param effectScoreSubIncrement
- */
+ * 璁剧疆 澧炲姞 鏁堣兘缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @param effectScoreSubIncrement
+ */
public StaffPerformStatQuery effectScoreSubIncrement(BigDecimal effectScoreSubIncrement){
- this.effectScoreSubIncrement = effectScoreSubIncrement;
- return this;
+ this.effectScoreSubIncrement = effectScoreSubIncrement;
+ return this;
}
/**
- * 璁剧疆 鏁堣兘缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @param effectScoreSubList
- */
+ * 璁剧疆 鏁堣兘缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @param effectScoreSubList
+ */
public StaffPerformStatQuery effectScoreSubList(List<BigDecimal> effectScoreSubList){
this.effectScoreSubList = effectScoreSubList;
- return this;
- }
-
- /**
- * 璁剧疆 鏁堣兘缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @param effectScoreSubNotList
- */
- public StaffPerformStatQuery effectScoreSubNotList(List<BigDecimal> effectScoreSubNotList){
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鏁堣兘缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @param effectScoreSubNotList
+ */
+ public StaffPerformStatQuery effectScoreSubNotList(List<BigDecimal> effectScoreSubNotList){
this.effectScoreSubNotList = effectScoreSubNotList;
return this;
- }
+ }
/**
- * 璁剧疆 鍏跺畠缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @param otherScoreAdd
- */
+ * 璁剧疆 鍏跺畠缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @param otherScoreAdd
+ */
public StaffPerformStatQuery otherScoreAdd(BigDecimal otherScoreAdd){
- setOtherScoreAdd(otherScoreAdd);
- return this;
- }
-
- /**
- * 璁剧疆 寮€濮� 鍏跺畠缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @param otherScoreAddStart
- */
+ setOtherScoreAdd(otherScoreAdd);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 鍏跺畠缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @param otherScoreAddStart
+ */
public StaffPerformStatQuery otherScoreAddStart(BigDecimal otherScoreAddStart){
- this.otherScoreAddStart = otherScoreAddStart;
- return this;
+ this.otherScoreAddStart = otherScoreAddStart;
+ return this;
}
/**
- * 璁剧疆 缁撴潫 鍏跺畠缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @param otherScoreAddEnd
- */
+ * 璁剧疆 缁撴潫 鍏跺畠缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @param otherScoreAddEnd
+ */
public StaffPerformStatQuery otherScoreAddEnd(BigDecimal otherScoreAddEnd){
- this.otherScoreAddEnd = otherScoreAddEnd;
- return this;
+ this.otherScoreAddEnd = otherScoreAddEnd;
+ return this;
}
/**
- * 璁剧疆 澧炲姞 鍏跺畠缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @param otherScoreAddIncrement
- */
+ * 璁剧疆 澧炲姞 鍏跺畠缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @param otherScoreAddIncrement
+ */
public StaffPerformStatQuery otherScoreAddIncrement(BigDecimal otherScoreAddIncrement){
- this.otherScoreAddIncrement = otherScoreAddIncrement;
- return this;
+ this.otherScoreAddIncrement = otherScoreAddIncrement;
+ return this;
}
/**
- * 璁剧疆 鍏跺畠缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @param otherScoreAddList
- */
+ * 璁剧疆 鍏跺畠缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @param otherScoreAddList
+ */
public StaffPerformStatQuery otherScoreAddList(List<BigDecimal> otherScoreAddList){
this.otherScoreAddList = otherScoreAddList;
- return this;
- }
-
- /**
- * 璁剧疆 鍏跺畠缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @param otherScoreAddNotList
- */
- public StaffPerformStatQuery otherScoreAddNotList(List<BigDecimal> otherScoreAddNotList){
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鍏跺畠缁╂晥鎸囨爣澧炲姞鍒嗘暟
+ * @param otherScoreAddNotList
+ */
+ public StaffPerformStatQuery otherScoreAddNotList(List<BigDecimal> otherScoreAddNotList){
this.otherScoreAddNotList = otherScoreAddNotList;
return this;
- }
+ }
/**
- * 璁剧疆 鍏跺畠缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @param otherScoreSub
- */
+ * 璁剧疆 鍏跺畠缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @param otherScoreSub
+ */
public StaffPerformStatQuery otherScoreSub(BigDecimal otherScoreSub){
- setOtherScoreSub(otherScoreSub);
- return this;
- }
-
- /**
- * 璁剧疆 寮€濮� 鍏跺畠缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @param otherScoreSubStart
- */
+ setOtherScoreSub(otherScoreSub);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 鍏跺畠缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @param otherScoreSubStart
+ */
public StaffPerformStatQuery otherScoreSubStart(BigDecimal otherScoreSubStart){
- this.otherScoreSubStart = otherScoreSubStart;
- return this;
+ this.otherScoreSubStart = otherScoreSubStart;
+ return this;
}
/**
- * 璁剧疆 缁撴潫 鍏跺畠缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @param otherScoreSubEnd
- */
+ * 璁剧疆 缁撴潫 鍏跺畠缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @param otherScoreSubEnd
+ */
public StaffPerformStatQuery otherScoreSubEnd(BigDecimal otherScoreSubEnd){
- this.otherScoreSubEnd = otherScoreSubEnd;
- return this;
+ this.otherScoreSubEnd = otherScoreSubEnd;
+ return this;
}
/**
- * 璁剧疆 澧炲姞 鍏跺畠缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @param otherScoreSubIncrement
- */
+ * 璁剧疆 澧炲姞 鍏跺畠缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @param otherScoreSubIncrement
+ */
public StaffPerformStatQuery otherScoreSubIncrement(BigDecimal otherScoreSubIncrement){
- this.otherScoreSubIncrement = otherScoreSubIncrement;
- return this;
+ this.otherScoreSubIncrement = otherScoreSubIncrement;
+ return this;
}
/**
- * 璁剧疆 鍏跺畠缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @param otherScoreSubList
- */
+ * 璁剧疆 鍏跺畠缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @param otherScoreSubList
+ */
public StaffPerformStatQuery otherScoreSubList(List<BigDecimal> otherScoreSubList){
this.otherScoreSubList = otherScoreSubList;
- return this;
- }
-
- /**
- * 璁剧疆 鍏跺畠缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @param otherScoreSubNotList
- */
- public StaffPerformStatQuery otherScoreSubNotList(List<BigDecimal> otherScoreSubNotList){
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鍏跺畠缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
+ * @param otherScoreSubNotList
+ */
+ public StaffPerformStatQuery otherScoreSubNotList(List<BigDecimal> otherScoreSubNotList){
this.otherScoreSubNotList = otherScoreSubNotList;
return this;
- }
+ }
+
/**
- * 璁剧疆 鏃�
- * @param day
- */
- public StaffPerformStatQuery day(Integer day){
- setDay(day);
- return this;
- }
-
- /**
- * 璁剧疆 寮€濮� 鏃�
- * @param dayStart
- */
- public StaffPerformStatQuery dayStart(Integer dayStart){
- this.dayStart = dayStart;
- return this;
+ * 璁剧疆 澶囨敞
+ * @param remark
+ */
+ public StaffPerformStatQuery remark(String remark){
+ setRemark(remark);
+ return this;
}
/**
- * 璁剧疆 缁撴潫 鏃�
- * @param dayEnd
- */
- public StaffPerformStatQuery dayEnd(Integer dayEnd){
- this.dayEnd = dayEnd;
- return this;
+ * 璁剧疆 澶囨敞
+ * @param remarkList
+ */
+ public StaffPerformStatQuery remarkList(List<String> remarkList){
+ this.remarkList = remarkList;
+ return this;
}
/**
- * 璁剧疆 澧炲姞 鏃�
- * @param dayIncrement
- */
- public StaffPerformStatQuery dayIncrement(Integer dayIncrement){
- this.dayIncrement = dayIncrement;
- return this;
+ * 璁剧疆 骞�
+ * @param year
+ */
+ public StaffPerformStatQuery year(Integer year){
+ setYear(year);
+ return this;
}
/**
- * 璁剧疆 鏃�
- * @param dayList
- */
- public StaffPerformStatQuery dayList(List<Integer> dayList){
- this.dayList = dayList;
- return this;
- }
-
- /**
- * 璁剧疆 鏃�
- * @param dayNotList
- */
- public StaffPerformStatQuery dayNotList(List<Integer> dayNotList){
- this.dayNotList = dayNotList;
+ * 璁剧疆 寮€濮� 骞�
+ * @param yearStart
+ */
+ public StaffPerformStatQuery yearStart(Integer yearStart){
+ this.yearStart = yearStart;
return this;
- }
+ }
/**
- * 璁剧疆 鍛樺伐缁╂晥鍔犲垎鎬诲垎鏁版眹鎬�
- * @param totalAddScore
- */
- public StaffPerformStatQuery totalAddScore(BigDecimal totalAddScore){
- setTotalAddScore(totalAddScore);
- return this;
- }
-
- /**
- * 璁剧疆 寮€濮� 鍛樺伐缁╂晥鍔犲垎鎬诲垎鏁版眹鎬�
- * @param totalAddScoreStart
- */
- public StaffPerformStatQuery totalAddScoreStart(BigDecimal totalAddScoreStart){
- this.totalAddScoreStart = totalAddScoreStart;
- return this;
+ * 璁剧疆 缁撴潫 骞�
+ * @param yearEnd
+ */
+ public StaffPerformStatQuery yearEnd(Integer yearEnd){
+ this.yearEnd = yearEnd;
+ return this;
}
/**
- * 璁剧疆 缁撴潫 鍛樺伐缁╂晥鍔犲垎鎬诲垎鏁版眹鎬�
- * @param totalAddScoreEnd
- */
- public StaffPerformStatQuery totalAddScoreEnd(BigDecimal totalAddScoreEnd){
- this.totalAddScoreEnd = totalAddScoreEnd;
- return this;
+ * 璁剧疆 澧炲姞 骞�
+ * @param yearIncrement
+ */
+ public StaffPerformStatQuery yearIncrement(Integer yearIncrement){
+ this.yearIncrement = yearIncrement;
+ return this;
}
/**
- * 璁剧疆 澧炲姞 鍛樺伐缁╂晥鍔犲垎鎬诲垎鏁版眹鎬�
- * @param totalAddScoreIncrement
- */
- public StaffPerformStatQuery totalAddScoreIncrement(BigDecimal totalAddScoreIncrement){
- this.totalAddScoreIncrement = totalAddScoreIncrement;
- return this;
+ * 璁剧疆 骞�
+ * @param yearList
+ */
+ public StaffPerformStatQuery yearList(List<Integer> yearList){
+ this.yearList = yearList;
+ return this;
}
/**
- * 璁剧疆 鍛樺伐缁╂晥鍔犲垎鎬诲垎鏁版眹鎬�
- * @param totalAddScoreList
- */
- public StaffPerformStatQuery totalAddScoreList(List<BigDecimal> totalAddScoreList){
- this.totalAddScoreList = totalAddScoreList;
- return this;
- }
-
- /**
- * 璁剧疆 鍛樺伐缁╂晥鍔犲垎鎬诲垎鏁版眹鎬�
- * @param totalAddScoreNotList
- */
- public StaffPerformStatQuery totalAddScoreNotList(List<BigDecimal> totalAddScoreNotList){
- this.totalAddScoreNotList = totalAddScoreNotList;
+ * 璁剧疆 骞�
+ * @param yearNotList
+ */
+ public StaffPerformStatQuery yearNotList(List<Integer> yearNotList){
+ this.yearNotList = yearNotList;
return this;
- }
+ }
/**
- * 璁剧疆 鍛樺伐缁╂晥鍑忓垎鎬诲垎鏁版眹鎬�
- * @param totalSubScore
- */
- public StaffPerformStatQuery totalSubScore(BigDecimal totalSubScore){
- setTotalSubScore(totalSubScore);
- return this;
- }
-
- /**
- * 璁剧疆 寮€濮� 鍛樺伐缁╂晥鍑忓垎鎬诲垎鏁版眹鎬�
- * @param totalSubScoreStart
- */
- public StaffPerformStatQuery totalSubScoreStart(BigDecimal totalSubScoreStart){
- this.totalSubScoreStart = totalSubScoreStart;
- return this;
+ * 璁剧疆 鏈�
+ * @param month
+ */
+ public StaffPerformStatQuery month(Integer month){
+ setMonth(month);
+ return this;
}
/**
- * 璁剧疆 缁撴潫 鍛樺伐缁╂晥鍑忓垎鎬诲垎鏁版眹鎬�
- * @param totalSubScoreEnd
- */
- public StaffPerformStatQuery totalSubScoreEnd(BigDecimal totalSubScoreEnd){
- this.totalSubScoreEnd = totalSubScoreEnd;
- return this;
+ * 璁剧疆 寮€濮� 鏈�
+ * @param monthStart
+ */
+ public StaffPerformStatQuery monthStart(Integer monthStart){
+ this.monthStart = monthStart;
+ return this;
}
/**
- * 璁剧疆 澧炲姞 鍛樺伐缁╂晥鍑忓垎鎬诲垎鏁版眹鎬�
- * @param totalSubScoreIncrement
- */
- public StaffPerformStatQuery totalSubScoreIncrement(BigDecimal totalSubScoreIncrement){
- this.totalSubScoreIncrement = totalSubScoreIncrement;
- return this;
+ * 璁剧疆 缁撴潫 鏈�
+ * @param monthEnd
+ */
+ public StaffPerformStatQuery monthEnd(Integer monthEnd){
+ this.monthEnd = monthEnd;
+ return this;
}
/**
- * 璁剧疆 鍛樺伐缁╂晥鍑忓垎鎬诲垎鏁版眹鎬�
- * @param totalSubScoreList
- */
- public StaffPerformStatQuery totalSubScoreList(List<BigDecimal> totalSubScoreList){
- this.totalSubScoreList = totalSubScoreList;
- return this;
- }
-
- /**
- * 璁剧疆 鍛樺伐缁╂晥鍑忓垎鎬诲垎鏁版眹鎬�
- * @param totalSubScoreNotList
- */
- public StaffPerformStatQuery totalSubScoreNotList(List<BigDecimal> totalSubScoreNotList){
- this.totalSubScoreNotList = totalSubScoreNotList;
+ * 璁剧疆 澧炲姞 鏈�
+ * @param monthIncrement
+ */
+ public StaffPerformStatQuery monthIncrement(Integer monthIncrement){
+ this.monthIncrement = monthIncrement;
return this;
- }
+ }
/**
- * 璁剧疆 鎶曡瘔缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @param complainScoreAdd
- */
- public StaffPerformStatQuery complainScoreAdd(BigDecimal complainScoreAdd){
- setComplainScoreAdd(complainScoreAdd);
- return this;
- }
-
- /**
- * 璁剧疆 寮€濮� 鎶曡瘔缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @param complainScoreAddStart
- */
- public StaffPerformStatQuery complainScoreAddStart(BigDecimal complainScoreAddStart){
- this.complainScoreAddStart = complainScoreAddStart;
- return this;
+ * 璁剧疆 鏈�
+ * @param monthList
+ */
+ public StaffPerformStatQuery monthList(List<Integer> monthList){
+ this.monthList = monthList;
+ return this;
}
/**
- * 璁剧疆 缁撴潫 鎶曡瘔缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @param complainScoreAddEnd
- */
- public StaffPerformStatQuery complainScoreAddEnd(BigDecimal complainScoreAddEnd){
- this.complainScoreAddEnd = complainScoreAddEnd;
- return this;
+ * 璁剧疆 鏈�
+ * @param monthNotList
+ */
+ public StaffPerformStatQuery monthNotList(List<Integer> monthNotList){
+ this.monthNotList = monthNotList;
+ return this;
}
/**
- * 璁剧疆 澧炲姞 鎶曡瘔缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @param complainScoreAddIncrement
- */
- public StaffPerformStatQuery complainScoreAddIncrement(BigDecimal complainScoreAddIncrement){
- this.complainScoreAddIncrement = complainScoreAddIncrement;
- return this;
+ * 璁剧疆 鏃�
+ * @param day
+ */
+ public StaffPerformStatQuery day(Integer day){
+ setDay(day);
+ return this;
}
/**
- * 璁剧疆 鎶曡瘔缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @param complainScoreAddList
- */
- public StaffPerformStatQuery complainScoreAddList(List<BigDecimal> complainScoreAddList){
- this.complainScoreAddList = complainScoreAddList;
- return this;
- }
-
- /**
- * 璁剧疆 鎶曡瘔缁╂晥鎸囨爣澧炲姞鍒嗘暟
- * @param complainScoreAddNotList
- */
- public StaffPerformStatQuery complainScoreAddNotList(List<BigDecimal> complainScoreAddNotList){
- this.complainScoreAddNotList = complainScoreAddNotList;
+ * 璁剧疆 寮€濮� 鏃�
+ * @param dayStart
+ */
+ public StaffPerformStatQuery dayStart(Integer dayStart){
+ this.dayStart = dayStart;
return this;
- }
+ }
/**
- * 璁剧疆 鎶曡瘔缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @param complainScoreSub
- */
- public StaffPerformStatQuery complainScoreSub(BigDecimal complainScoreSub){
- setComplainScoreSub(complainScoreSub);
- return this;
- }
-
- /**
- * 璁剧疆 寮€濮� 鎶曡瘔缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @param complainScoreSubStart
- */
- public StaffPerformStatQuery complainScoreSubStart(BigDecimal complainScoreSubStart){
- this.complainScoreSubStart = complainScoreSubStart;
- return this;
+ * 璁剧疆 缁撴潫 鏃�
+ * @param dayEnd
+ */
+ public StaffPerformStatQuery dayEnd(Integer dayEnd){
+ this.dayEnd = dayEnd;
+ return this;
}
/**
- * 璁剧疆 缁撴潫 鎶曡瘔缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @param complainScoreSubEnd
- */
- public StaffPerformStatQuery complainScoreSubEnd(BigDecimal complainScoreSubEnd){
- this.complainScoreSubEnd = complainScoreSubEnd;
- return this;
+ * 璁剧疆 澧炲姞 鏃�
+ * @param dayIncrement
+ */
+ public StaffPerformStatQuery dayIncrement(Integer dayIncrement){
+ this.dayIncrement = dayIncrement;
+ return this;
}
/**
- * 璁剧疆 澧炲姞 鎶曡瘔缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @param complainScoreSubIncrement
- */
- public StaffPerformStatQuery complainScoreSubIncrement(BigDecimal complainScoreSubIncrement){
- this.complainScoreSubIncrement = complainScoreSubIncrement;
- return this;
+ * 璁剧疆 鏃�
+ * @param dayList
+ */
+ public StaffPerformStatQuery dayList(List<Integer> dayList){
+ this.dayList = dayList;
+ return this;
}
/**
- * 璁剧疆 鎶曡瘔缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @param complainScoreSubList
- */
- public StaffPerformStatQuery complainScoreSubList(List<BigDecimal> complainScoreSubList){
- this.complainScoreSubList = complainScoreSubList;
- return this;
- }
-
- /**
- * 璁剧疆 鎶曡瘔缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟
- * @param complainScoreSubNotList
- */
- public StaffPerformStatQuery complainScoreSubNotList(List<BigDecimal> complainScoreSubNotList){
- this.complainScoreSubNotList = complainScoreSubNotList;
+ * 璁剧疆 鏃�
+ * @param dayNotList
+ */
+ public StaffPerformStatQuery dayNotList(List<Integer> dayNotList){
+ this.dayNotList = dayNotList;
+ return this;
+ }
+
+
+ /**
+ * 璁剧疆 鍒涘缓浜篿d
+ * @param createUserId
+ */
+ public StaffPerformStatQuery createUserId(Long createUserId){
+ setCreateUserId(createUserId);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 鍒涘缓浜篿d
+ * @param createUserIdStart
+ */
+ public StaffPerformStatQuery createUserIdStart(Long createUserIdStart){
+ this.createUserIdStart = createUserIdStart;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 缁撴潫 鍒涘缓浜篿d
+ * @param createUserIdEnd
+ */
+ public StaffPerformStatQuery createUserIdEnd(Long createUserIdEnd){
+ this.createUserIdEnd = createUserIdEnd;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 澧炲姞 鍒涘缓浜篿d
+ * @param createUserIdIncrement
+ */
+ public StaffPerformStatQuery createUserIdIncrement(Long createUserIdIncrement){
+ this.createUserIdIncrement = createUserIdIncrement;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鍒涘缓浜篿d
+ * @param createUserIdList
+ */
+ public StaffPerformStatQuery createUserIdList(List<Long> createUserIdList){
+ this.createUserIdList = createUserIdList;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鍒涘缓浜篿d
+ * @param createUserIdNotList
+ */
+ public StaffPerformStatQuery createUserIdNotList(List<Long> createUserIdNotList){
+ this.createUserIdNotList = createUserIdNotList;
+ return this;
+ }
+
+
+ /**
+ * 璁剧疆 鏇存柊浜篿d
+ * @param updateUserId
+ */
+ public StaffPerformStatQuery updateUserId(Long updateUserId){
+ setUpdateUserId(updateUserId);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 鏇存柊浜篿d
+ * @param updateUserIdStart
+ */
+ public StaffPerformStatQuery updateUserIdStart(Long updateUserIdStart){
+ this.updateUserIdStart = updateUserIdStart;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 缁撴潫 鏇存柊浜篿d
+ * @param updateUserIdEnd
+ */
+ public StaffPerformStatQuery updateUserIdEnd(Long updateUserIdEnd){
+ this.updateUserIdEnd = updateUserIdEnd;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 澧炲姞 鏇存柊浜篿d
+ * @param updateUserIdIncrement
+ */
+ public StaffPerformStatQuery updateUserIdIncrement(Long updateUserIdIncrement){
+ this.updateUserIdIncrement = updateUserIdIncrement;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鏇存柊浜篿d
+ * @param updateUserIdList
+ */
+ public StaffPerformStatQuery updateUserIdList(List<Long> updateUserIdList){
+ this.updateUserIdList = updateUserIdList;
return this;
- }
+ }
+
+ /**
+ * 璁剧疆 鏇存柊浜篿d
+ * @param updateUserIdNotList
+ */
+ public StaffPerformStatQuery updateUserIdNotList(List<Long> updateUserIdNotList){
+ this.updateUserIdNotList = updateUserIdNotList;
+ return this;
+ }
/**
- * 鑾峰彇 OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
- * @return orConditionList
- */
+ * 鑾峰彇 OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+ * @return orConditionList
+ */
public List<StaffPerformStatQuery> getOrConditionList(){
- return this.orConditionList;
+ return this.orConditionList;
}
/**
- * 璁剧疆 OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
- * @param orConditionList
- */
+ * 璁剧疆 OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+ * @param orConditionList
+ */
public void setOrConditionList(List<StaffPerformStatQuery> orConditionList){
this.orConditionList = orConditionList;
}
/**
- * 鑾峰彇 AND鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疉ND锛岄」鍐呭涔嬮棿鏄疧R锛屽锛�(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
- * @return andConditionList
- */
+ * 鑾峰彇 AND鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疉ND锛岄」鍐呭涔嬮棿鏄疧R锛屽锛�(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+ * @return andConditionList
+ */
public List<StaffPerformStatQuery> getAndConditionList(){
return this.andConditionList;
}
/**
- * 璁剧疆 AND鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疉ND锛岄」鍐呭涔嬮棿鏄疧R锛屽锛�(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
- * @param andConditionList
- */
+ * 璁剧疆 AND鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疉ND锛岄」鍐呭涔嬮棿鏄疧R锛屽锛�(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+ * @param andConditionList
+ */
public void setAndConditionList(List<StaffPerformStatQuery> andConditionList){
this.andConditionList = andConditionList;
}
diff --git a/attendance-performance-manager/src/main/resources/bootstrap.yml b/attendance-performance-manager/src/main/resources/bootstrap.yml
index ed19ce2f71544c62cd498de9cc06e22cfb980d6c..b8100a091f91bec1c0c8fa60efe8d760bf080f45 100644
--- a/attendance-performance-manager/src/main/resources/bootstrap.yml
+++ b/attendance-performance-manager/src/main/resources/bootstrap.yml
@@ -62,4 +62,7 @@ hik:
protocol: @profiles.hik.protocol@
appSecret: @profiles.hik.appSecret@
dingtalk:
- agentId: 123123
+ agentId: 2652674890
+ AppKey: dingpqzradgfr4efdi2j
+ AppSecret: bF2WALmo5_Wuj3hg5gXeWqezrYnZChUJ88HjzNWpkA9ivdOxfBDGOGYcfVRfB3vd
+
diff --git a/attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckAllRecordMapper.xml b/attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckAllRecordMapper.xml
index bbc7abf7403063f304e10cd3012aff4b7febdf9c..547647ad0b4c107266858df8b1fad66b00cd2199 100644
--- a/attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckAllRecordMapper.xml
+++ b/attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckAllRecordMapper.xml
@@ -4,7 +4,7 @@
<mapper namespace="com.mortals.xhx.module.check.dao.ibatis.CheckAllRecordDaoImpl">
<select id="getList" parameterType="com.mortals.xhx.module.check.model.CheckAllRecordQuery" resultType="com.mortals.xhx.module.check.model.vo.CheckAllRecordVo">
- SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,subAddType,score,subMethod,checkTime,createTime AS deductTime,1 AS checkType FROM mortals_xhx_check_attend_record WHERE 1=1
+ SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,subAddType,score,subMethod,checkTime,createTime AS deductTime,1 AS checkType ,'attend' AS performType FROM mortals_xhx_check_attend_record WHERE 1=1
<if test="checkStatus != null and checkStatus!=''"> AND checkStatus = #{checkStatus} </if>
<if test="subMethod != null and subMethod!=''"> AND subMethod = #{subMethod} </if>
<if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
@@ -12,7 +12,7 @@
<if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
<if test="createUserId != null and createUserId!=''"> AND createUserId = #{createUserId} </if>
UNION
- SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,2 AS subAddType,score,subMethod,checkTime,createTime AS deductTime,2 AS checkType FROM mortals_xhx_check_effect_record WHERE 1=1
+ SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,2 AS subAddType,score,subMethod,checkTime,createTime AS deductTime,4 AS checkType ,'effect' AS performType FROM mortals_xhx_check_effect_record WHERE 1=1
<if test="checkStatus != null and checkStatus!=''"> AND checkStatus = #{checkStatus} </if>
<if test="subMethod != null and subMethod!=''"> AND subMethod = #{subMethod} </if>
<if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
@@ -20,7 +20,7 @@
<if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
<if test="createUserId != null and createUserId!=''"> AND createUserId = #{createUserId} </if>
UNION
- SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,2 AS subAddType,score,subMethod,checkTime,createTime AS deductTime,3 AS checkType FROM mortals_xhx_check_complain_record WHERE 1=1
+ SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,2 AS subAddType,score,subMethod,checkTime,createTime AS deductTime,6 AS checkType ,'complain' AS performType FROM mortals_xhx_check_complain_record WHERE 1=1
<if test="checkStatus != null and checkStatus!=''"> AND checkStatus = #{checkStatus} </if>
<if test="subMethod != null and subMethod!=''"> AND subMethod = #{subMethod} </if>
<if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
@@ -28,7 +28,7 @@
<if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
<if test="createUserId != null and createUserId!=''"> AND createUserId = #{createUserId} </if>
UNION
- SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,2 AS subAddType,score,subMethod,checkTime,createTime AS deductTime,4 AS checkType FROM mortals_xhx_check_gowork_record WHERE 1=1
+ SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,2 AS subAddType,score,subMethod,checkTime,createTime AS deductTime,3 AS checkType ,'gowork' AS performType FROM mortals_xhx_check_gowork_record WHERE 1=1
<if test="checkStatus != null and checkStatus!=''"> AND checkStatus = #{checkStatus} </if>
<if test="subMethod != null and subMethod!=''"> AND subMethod = #{subMethod} </if>
<if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
@@ -36,7 +36,7 @@
<if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
<if test="createUserId != null and createUserId!=''"> AND createUserId = #{createUserId} </if>
UNION
- SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,2 AS subAddType,score,subMethod,checkTime,createTime AS deductTime,5 AS checkType FROM mortals_xhx_check_review_record WHERE 1=1
+ SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,2 AS subAddType,score,subMethod,checkTime,createTime AS deductTime,2 AS checkType ,'review' AS performType FROM mortals_xhx_check_review_record WHERE 1=1
<if test="checkStatus != null and checkStatus!=''"> AND checkStatus = #{checkStatus} </if>
<if test="subMethod != null and subMethod!=''"> AND subMethod = #{subMethod} </if>
<if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
@@ -44,7 +44,7 @@
<if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
<if test="createUserId != null and createUserId!=''"> AND createUserId = #{createUserId} </if>
UNION
- SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,2 AS subAddType,score,subMethod,checkTime,createTime AS deductTime,6 AS checkType FROM mortals_xhx_check_other_record WHERE 1=1
+ SELECT id,recordId,staffId,staffName,workNum,deptId,deptName,ruleId,ruleName,2 AS subAddType,score,subMethod,checkTime,createTime AS deductTime,5 AS checkType ,'other' AS performType FROM mortals_xhx_check_other_record WHERE 1=1
<if test="checkStatus != null and checkStatus!=''"> AND checkStatus = #{checkStatus} </if>
<if test="subMethod != null and subMethod!=''"> AND subMethod = #{subMethod} </if>
<if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
diff --git a/attendance-performance-manager/src/main/resources/sqlmap/module/feedback/FeedbackMapperExt.xml b/attendance-performance-manager/src/main/resources/sqlmap/module/feedback/FeedbackMapperExt.xml
index 624148ce1248c2db9c118297d969a37cd3ddb31e..62d20a97103d3b7107fc78c4201209e8f3299e75 100644
--- a/attendance-performance-manager/src/main/resources/sqlmap/module/feedback/FeedbackMapperExt.xml
+++ b/attendance-performance-manager/src/main/resources/sqlmap/module/feedback/FeedbackMapperExt.xml
@@ -4,24 +4,56 @@
<mapper namespace="com.mortals.xhx.module.feedback.dao.ibatis.FeedbackDaoImpl">
<!-- 闂嵎鍙嶉浜哄憳鍒楄〃 -->
- <select id="getFeedbackStaffList" parameterType="long" resultType="com.mortals.xhx.module.feedback.model.vo.FeedbackStaffInfoVo">
- SELECT
- s.feedbackId,
- s.staffId,
- s1.`name`,
- s1.deptId,
- s1.deptName,
- s1.positionName,
- CASE IFNULL(a.id, 0) WHEN 0 THEN 0 ELSE 1 END AS backStatus,
- MAX(a.createTime) AS backTime
- FROM
- mortals_xhx_feedback_staff s
- LEFT JOIN mortals_xhx_feedback_answer a ON s.staffId = a.staffId AND s.feedbackId = a.feedbackId
- LEFT JOIN mortals_xhx_staff s1 ON s.staffId = s1.id
- WHERE
- s.feedbackId = #{feedbackId}
- GROUP BY
- s.staffId;
+ <select id="getFeedbackStaffList" parameterType="com.mortals.xhx.module.feedback.model.FeedbackEntity" resultType="com.mortals.xhx.module.feedback.model.vo.FeedbackStaffInfoVo">
+ SELECT * FROM (
+ SELECT
+ s.feedbackId,
+ s.staffId,
+ s1.`name`,
+ s1.deptId,
+ s1.deptName,
+ s1.positionName,
+ CASE IFNULL(a.id, 0) WHEN 0 THEN 0 ELSE 1 END AS backStatus,
+ MAX(a.createTime) AS backTime
+ FROM
+ mortals_xhx_feedback_staff s
+ LEFT JOIN mortals_xhx_feedback_answer a ON s.staffId = a.staffId AND s.feedbackId = a.feedbackId
+ LEFT JOIN mortals_xhx_staff s1 ON s.staffId = s1.id
+ WHERE
+ s.feedbackId = #{feedbackId}
+ GROUP BY
+ s.staffId
+ ) AS t WHERE 1=1
+ <if test="backStatus != null">
+ AND t.backStatus = #{backStatus}
+ </if>
+ </select>
+
+ <select id="getFeedbackStaffListCount" parameterType="com.mortals.xhx.module.feedback.model.FeedbackEntity" resultType="int">
+ select count(1) from (
+ SELECT * FROM (
+ SELECT
+ s.feedbackId,
+ s.staffId,
+ s1.`name`,
+ s1.deptId,
+ s1.deptName,
+ s1.positionName,
+ CASE IFNULL(a.id, 0) WHEN 0 THEN 0 ELSE 1 END AS backStatus,
+ MAX(a.createTime) AS backTime
+ FROM
+ mortals_xhx_feedback_staff s
+ LEFT JOIN mortals_xhx_feedback_answer a ON s.staffId = a.staffId AND s.feedbackId = a.feedbackId
+ LEFT JOIN mortals_xhx_staff s1 ON s.staffId = s1.id
+ WHERE
+ s.feedbackId = #{feedbackId}
+ GROUP BY
+ s.staffId
+ ) AS t WHERE 1=1
+ <if test="backStatus != null">
+ AND t.backStatus = #{backStatus}
+ </if>
+ ) as tt
</select>
<!-- 闂嵎鍗曢€夊閫夊弽棣堢粺璁� -->
diff --git a/attendance-performance-manager/src/main/resources/sqlmap/module/staff/StaffPerformStatMapper.xml b/attendance-performance-manager/src/main/resources/sqlmap/module/staff/StaffPerformStatMapper.xml
index 72556b513cde717b54424efc1f7a39cc748f0005..0b983e0706666393eb53cf778081963fc5cc66f6 100644
--- a/attendance-performance-manager/src/main/resources/sqlmap/module/staff/StaffPerformStatMapper.xml
+++ b/attendance-performance-manager/src/main/resources/sqlmap/module/staff/StaffPerformStatMapper.xml
@@ -1,138 +1,138 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"mybatis-3-mapper.dtd">
+ "mybatis-3-mapper.dtd">
<mapper namespace="com.mortals.xhx.module.staff.dao.ibatis.StaffPerformStatDaoImpl">
<!-- 瀛楁鍜屽睘鎬ф槧灏� -->
<resultMap type="StaffPerformStatEntity" id="StaffPerformStatEntity-Map">
- <id property="id" column="id" />
- <result property="deptId" column="deptId" />
- <result property="deptName" column="deptName" />
- <result property="totalScore" column="totalScore" />
- <result property="remark" column="remark" />
- <result property="year" column="year" />
- <result property="month" column="month" />
- <result property="createTime" column="createTime" />
- <result property="createUserId" column="createUserId" />
- <result property="updateTime" column="updateTime" />
- <result property="updateUserId" column="updateUserId" />
- <result property="attendScoreAdd" column="attendScoreAdd" />
- <result property="attendScoreSub" column="attendScoreSub" />
- <result property="assessScoreAdd" column="assessScoreAdd" />
- <result property="assessScoreSub" column="assessScoreSub" />
- <result property="workScoreAdd" column="workScoreAdd" />
- <result property="workScoreSub" column="workScoreSub" />
- <result property="effectScoreAdd" column="effectScoreAdd" />
- <result property="effectScoreSub" column="effectScoreSub" />
- <result property="otherScoreAdd" column="otherScoreAdd" />
- <result property="otherScoreSub" column="otherScoreSub" />
- <result property="day" column="day" />
- <result property="totalAddScore" column="totalAddScore" />
- <result property="totalSubScore" column="totalSubScore" />
- <result property="complainScoreAdd" column="complainScoreAdd" />
- <result property="complainScoreSub" column="complainScoreSub" />
-
+ <id property="id" column="id" />
+ <result property="staffId" column="staffId" />
+ <result property="staffName" column="staffName" />
+ <result property="totalScore" column="totalScore" />
+ <result property="totalAddScore" column="totalAddScore" />
+ <result property="totalSubScore" column="totalSubScore" />
+ <result property="attendScoreAdd" column="attendScoreAdd" />
+ <result property="attendScoreSub" column="attendScoreSub" />
+ <result property="assessScoreAdd" column="assessScoreAdd" />
+ <result property="assessScoreSub" column="assessScoreSub" />
+ <result property="complainScoreAdd" column="complainScoreAdd" />
+ <result property="complainScoreSub" column="complainScoreSub" />
+ <result property="workScoreAdd" column="workScoreAdd" />
+ <result property="workScoreSub" column="workScoreSub" />
+ <result property="effectScoreAdd" column="effectScoreAdd" />
+ <result property="effectScoreSub" column="effectScoreSub" />
+ <result property="otherScoreAdd" column="otherScoreAdd" />
+ <result property="otherScoreSub" column="otherScoreSub" />
+ <result property="remark" column="remark" />
+ <result property="year" column="year" />
+ <result property="month" column="month" />
+ <result property="day" column="day" />
+ <result property="createTime" column="createTime" />
+ <result property="createUserId" column="createUserId" />
+ <result property="updateTime" column="updateTime" />
+ <result property="updateUserId" column="updateUserId" />
+
</resultMap>
<!-- 琛ㄦ墍鏈夊垪 -->
<sql id="_columns">
<trim suffixOverrides="," suffix="">
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
- a.id,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deptId') or colPickMode == 1 and data.containsKey('deptId')))">
- a.deptId,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deptName') or colPickMode == 1 and data.containsKey('deptName')))">
- a.deptName,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('totalScore') or colPickMode == 1 and data.containsKey('totalScore')))">
- a.totalScore,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('remark') or colPickMode == 1 and data.containsKey('remark')))">
- a.remark,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('year') or colPickMode == 1 and data.containsKey('year')))">
- a.year,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('month') or colPickMode == 1 and data.containsKey('month')))">
- a.month,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
- a.createTime,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
- a.createUserId,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
- a.updateTime,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateUserId') or colPickMode == 1 and data.containsKey('updateUserId')))">
- a.updateUserId,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('attendScoreAdd') or colPickMode == 1 and data.containsKey('attendScoreAdd')))">
- a.attendScoreAdd,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('attendScoreSub') or colPickMode == 1 and data.containsKey('attendScoreSub')))">
- a.attendScoreSub,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('assessScoreAdd') or colPickMode == 1 and data.containsKey('assessScoreAdd')))">
- a.assessScoreAdd,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('assessScoreSub') or colPickMode == 1 and data.containsKey('assessScoreSub')))">
- a.assessScoreSub,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('workScoreAdd') or colPickMode == 1 and data.containsKey('workScoreAdd')))">
- a.workScoreAdd,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('workScoreSub') or colPickMode == 1 and data.containsKey('workScoreSub')))">
- a.workScoreSub,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('effectScoreAdd') or colPickMode == 1 and data.containsKey('effectScoreAdd')))">
- a.effectScoreAdd,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('effectScoreSub') or colPickMode == 1 and data.containsKey('effectScoreSub')))">
- a.effectScoreSub,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('otherScoreAdd') or colPickMode == 1 and data.containsKey('otherScoreAdd')))">
- a.otherScoreAdd,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('otherScoreSub') or colPickMode == 1 and data.containsKey('otherScoreSub')))">
- a.otherScoreSub,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('day') or colPickMode == 1 and data.containsKey('day')))">
- a.day,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('totalAddScore') or colPickMode == 1 and data.containsKey('totalAddScore')))">
- a.totalAddScore,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('totalSubScore') or colPickMode == 1 and data.containsKey('totalSubScore')))">
- a.totalSubScore,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('complainScoreAdd') or colPickMode == 1 and data.containsKey('complainScoreAdd')))">
- a.complainScoreAdd,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('complainScoreSub') or colPickMode == 1 and data.containsKey('complainScoreSub')))">
- a.complainScoreSub,
- </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
+ a.id,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('staffId') or colPickMode == 1 and data.containsKey('staffId')))">
+ a.staffId,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('staffName') or colPickMode == 1 and data.containsKey('staffName')))">
+ a.staffName,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('totalScore') or colPickMode == 1 and data.containsKey('totalScore')))">
+ a.totalScore,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('totalAddScore') or colPickMode == 1 and data.containsKey('totalAddScore')))">
+ a.totalAddScore,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('totalSubScore') or colPickMode == 1 and data.containsKey('totalSubScore')))">
+ a.totalSubScore,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('attendScoreAdd') or colPickMode == 1 and data.containsKey('attendScoreAdd')))">
+ a.attendScoreAdd,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('attendScoreSub') or colPickMode == 1 and data.containsKey('attendScoreSub')))">
+ a.attendScoreSub,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('assessScoreAdd') or colPickMode == 1 and data.containsKey('assessScoreAdd')))">
+ a.assessScoreAdd,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('assessScoreSub') or colPickMode == 1 and data.containsKey('assessScoreSub')))">
+ a.assessScoreSub,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('complainScoreAdd') or colPickMode == 1 and data.containsKey('complainScoreAdd')))">
+ a.complainScoreAdd,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('complainScoreSub') or colPickMode == 1 and data.containsKey('complainScoreSub')))">
+ a.complainScoreSub,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('workScoreAdd') or colPickMode == 1 and data.containsKey('workScoreAdd')))">
+ a.workScoreAdd,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('workScoreSub') or colPickMode == 1 and data.containsKey('workScoreSub')))">
+ a.workScoreSub,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('effectScoreAdd') or colPickMode == 1 and data.containsKey('effectScoreAdd')))">
+ a.effectScoreAdd,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('effectScoreSub') or colPickMode == 1 and data.containsKey('effectScoreSub')))">
+ a.effectScoreSub,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('otherScoreAdd') or colPickMode == 1 and data.containsKey('otherScoreAdd')))">
+ a.otherScoreAdd,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('otherScoreSub') or colPickMode == 1 and data.containsKey('otherScoreSub')))">
+ a.otherScoreSub,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('remark') or colPickMode == 1 and data.containsKey('remark')))">
+ a.remark,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('year') or colPickMode == 1 and data.containsKey('year')))">
+ a.year,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('month') or colPickMode == 1 and data.containsKey('month')))">
+ a.month,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('day') or colPickMode == 1 and data.containsKey('day')))">
+ a.day,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
+ a.createTime,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
+ a.createUserId,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
+ a.updateTime,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateUserId') or colPickMode == 1 and data.containsKey('updateUserId')))">
+ a.updateUserId,
+ </if>
</trim>
</sql>
<!-- 鏂板 鍖哄垎涓婚敭鑷鍔犺繕鏄笟鍔℃彃鍏� -->
<insert id="insert" parameterType="StaffPerformStatEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_staff_perform_stat
- (deptId,deptName,totalScore,remark,year,month,createTime,createUserId,updateTime,updateUserId,attendScoreAdd,attendScoreSub,assessScoreAdd,assessScoreSub,workScoreAdd,workScoreSub,effectScoreAdd,effectScoreSub,otherScoreAdd,otherScoreSub,day,totalAddScore,totalSubScore,complainScoreAdd,complainScoreSub)
+ (staffId,staffName,totalScore,totalAddScore,totalSubScore,attendScoreAdd,attendScoreSub,assessScoreAdd,assessScoreSub,complainScoreAdd,complainScoreSub,workScoreAdd,workScoreSub,effectScoreAdd,effectScoreSub,otherScoreAdd,otherScoreSub,remark,year,month,day,createTime,createUserId,updateTime,updateUserId)
VALUES
- (#{deptId},#{deptName},#{totalScore},#{remark},#{year},#{month},#{createTime},#{createUserId},#{updateTime},#{updateUserId},#{attendScoreAdd},#{attendScoreSub},#{assessScoreAdd},#{assessScoreSub},#{workScoreAdd},#{workScoreSub},#{effectScoreAdd},#{effectScoreSub},#{otherScoreAdd},#{otherScoreSub},#{day},#{totalAddScore},#{totalSubScore},#{complainScoreAdd},#{complainScoreSub})
+ (#{staffId},#{staffName},#{totalScore},#{totalAddScore},#{totalSubScore},#{attendScoreAdd},#{attendScoreSub},#{assessScoreAdd},#{assessScoreSub},#{complainScoreAdd},#{complainScoreSub},#{workScoreAdd},#{workScoreSub},#{effectScoreAdd},#{effectScoreSub},#{otherScoreAdd},#{otherScoreSub},#{remark},#{year},#{month},#{day},#{createTime},#{createUserId},#{updateTime},#{updateUserId})
</insert>
<!-- 鎵归噺鏂板 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_staff_perform_stat
- (deptId,deptName,totalScore,remark,year,month,createTime,createUserId,updateTime,updateUserId,attendScoreAdd,attendScoreSub,assessScoreAdd,assessScoreSub,workScoreAdd,workScoreSub,effectScoreAdd,effectScoreSub,otherScoreAdd,otherScoreSub,day,totalAddScore,totalSubScore,complainScoreAdd,complainScoreSub)
+ (staffId,staffName,totalScore,totalAddScore,totalSubScore,attendScoreAdd,attendScoreSub,assessScoreAdd,assessScoreSub,complainScoreAdd,complainScoreSub,workScoreAdd,workScoreSub,effectScoreAdd,effectScoreSub,otherScoreAdd,otherScoreSub,remark,year,month,day,createTime,createUserId,updateTime,updateUserId)
VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," >
- (#{item.deptId},#{item.deptName},#{item.totalScore},#{item.remark},#{item.year},#{item.month},#{item.createTime},#{item.createUserId},#{item.updateTime},#{item.updateUserId},#{item.attendScoreAdd},#{item.attendScoreSub},#{item.assessScoreAdd},#{item.assessScoreSub},#{item.workScoreAdd},#{item.workScoreSub},#{item.effectScoreAdd},#{item.effectScoreSub},#{item.otherScoreAdd},#{item.otherScoreSub},#{item.day},#{item.totalAddScore},#{item.totalSubScore},#{item.complainScoreAdd},#{item.complainScoreSub})
+ (#{item.staffId},#{item.staffName},#{item.totalScore},#{item.totalAddScore},#{item.totalSubScore},#{item.attendScoreAdd},#{item.attendScoreSub},#{item.assessScoreAdd},#{item.assessScoreSub},#{item.complainScoreAdd},#{item.complainScoreSub},#{item.workScoreAdd},#{item.workScoreSub},#{item.effectScoreAdd},#{item.effectScoreSub},#{item.otherScoreAdd},#{item.otherScoreSub},#{item.remark},#{item.year},#{item.month},#{item.day},#{item.createTime},#{item.createUserId},#{item.updateTime},#{item.updateUserId})
</foreach>
</insert>
@@ -142,14 +142,14 @@
update mortals_xhx_staff_perform_stat as a
set
<trim suffixOverrides="," suffix="">
- <if test="(colPickMode==0 and data.containsKey('deptId')) or (colPickMode==1 and !data.containsKey('deptId'))">
- a.deptId=#{data.deptId},
+ <if test="(colPickMode==0 and data.containsKey('staffId')) or (colPickMode==1 and !data.containsKey('staffId'))">
+ a.staffId=#{data.staffId},
</if>
- <if test="(colPickMode==0 and data.containsKey('deptIdIncrement')) or (colPickMode==1 and !data.containsKey('deptIdIncrement'))">
- a.deptId=ifnull(a.deptId,0) + #{data.deptIdIncrement},
+ <if test="(colPickMode==0 and data.containsKey('staffIdIncrement')) or (colPickMode==1 and !data.containsKey('staffIdIncrement'))">
+ a.staffId=ifnull(a.staffId,0) + #{data.staffIdIncrement},
</if>
- <if test="(colPickMode==0 and data.containsKey('deptName')) or (colPickMode==1 and !data.containsKey('deptName'))">
- a.deptName=#{data.deptName},
+ <if test="(colPickMode==0 and data.containsKey('staffName')) or (colPickMode==1 and !data.containsKey('staffName'))">
+ a.staffName=#{data.staffName},
</if>
<if test="(colPickMode==0 and data.containsKey('totalScore')) or (colPickMode==1 and !data.containsKey('totalScore'))">
a.totalScore=#{data.totalScore},
@@ -157,38 +157,17 @@
<if test="(colPickMode==0 and data.containsKey('totalScoreIncrement')) or (colPickMode==1 and !data.containsKey('totalScoreIncrement'))">
a.totalScore=ifnull(a.totalScore,0) + #{data.totalScoreIncrement},
</if>
- <if test="(colPickMode==0 and data.containsKey('remark')) or (colPickMode==1 and !data.containsKey('remark'))">
- a.remark=#{data.remark},
- </if>
- <if test="(colPickMode==0 and data.containsKey('year')) or (colPickMode==1 and !data.containsKey('year'))">
- a.year=#{data.year},
- </if>
- <if test="(colPickMode==0 and data.containsKey('yearIncrement')) or (colPickMode==1 and !data.containsKey('yearIncrement'))">
- a.year=ifnull(a.year,0) + #{data.yearIncrement},
- </if>
- <if test="(colPickMode==0 and data.containsKey('month')) or (colPickMode==1 and !data.containsKey('month'))">
- a.month=#{data.month},
- </if>
- <if test="(colPickMode==0 and data.containsKey('monthIncrement')) or (colPickMode==1 and !data.containsKey('monthIncrement'))">
- a.month=ifnull(a.month,0) + #{data.monthIncrement},
- </if>
- <if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
- a.createTime=#{data.createTime},
- </if>
- <if test="(colPickMode==0 and data.containsKey('createUserId')) or (colPickMode==1 and !data.containsKey('createUserId'))">
- a.createUserId=#{data.createUserId},
- </if>
- <if test="(colPickMode==0 and data.containsKey('createUserIdIncrement')) or (colPickMode==1 and !data.containsKey('createUserIdIncrement'))">
- a.createUserId=ifnull(a.createUserId,0) + #{data.createUserIdIncrement},
+ <if test="(colPickMode==0 and data.containsKey('totalAddScore')) or (colPickMode==1 and !data.containsKey('totalAddScore'))">
+ a.totalAddScore=#{data.totalAddScore},
</if>
- <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
- a.updateTime=#{data.updateTime},
+ <if test="(colPickMode==0 and data.containsKey('totalAddScoreIncrement')) or (colPickMode==1 and !data.containsKey('totalAddScoreIncrement'))">
+ a.totalAddScore=ifnull(a.totalAddScore,0) + #{data.totalAddScoreIncrement},
</if>
- <if test="(colPickMode==0 and data.containsKey('updateUserId')) or (colPickMode==1 and !data.containsKey('updateUserId'))">
- a.updateUserId=#{data.updateUserId},
+ <if test="(colPickMode==0 and data.containsKey('totalSubScore')) or (colPickMode==1 and !data.containsKey('totalSubScore'))">
+ a.totalSubScore=#{data.totalSubScore},
</if>
- <if test="(colPickMode==0 and data.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !data.containsKey('updateUserIdIncrement'))">
- a.updateUserId=ifnull(a.updateUserId,0) + #{data.updateUserIdIncrement},
+ <if test="(colPickMode==0 and data.containsKey('totalSubScoreIncrement')) or (colPickMode==1 and !data.containsKey('totalSubScoreIncrement'))">
+ a.totalSubScore=ifnull(a.totalSubScore,0) + #{data.totalSubScoreIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('attendScoreAdd')) or (colPickMode==1 and !data.containsKey('attendScoreAdd'))">
a.attendScoreAdd=#{data.attendScoreAdd},
@@ -214,6 +193,18 @@
<if test="(colPickMode==0 and data.containsKey('assessScoreSubIncrement')) or (colPickMode==1 and !data.containsKey('assessScoreSubIncrement'))">
a.assessScoreSub=ifnull(a.assessScoreSub,0) + #{data.assessScoreSubIncrement},
</if>
+ <if test="(colPickMode==0 and data.containsKey('complainScoreAdd')) or (colPickMode==1 and !data.containsKey('complainScoreAdd'))">
+ a.complainScoreAdd=#{data.complainScoreAdd},
+ </if>
+ <if test="(colPickMode==0 and data.containsKey('complainScoreAddIncrement')) or (colPickMode==1 and !data.containsKey('complainScoreAddIncrement'))">
+ a.complainScoreAdd=ifnull(a.complainScoreAdd,0) + #{data.complainScoreAddIncrement},
+ </if>
+ <if test="(colPickMode==0 and data.containsKey('complainScoreSub')) or (colPickMode==1 and !data.containsKey('complainScoreSub'))">
+ a.complainScoreSub=#{data.complainScoreSub},
+ </if>
+ <if test="(colPickMode==0 and data.containsKey('complainScoreSubIncrement')) or (colPickMode==1 and !data.containsKey('complainScoreSubIncrement'))">
+ a.complainScoreSub=ifnull(a.complainScoreSub,0) + #{data.complainScoreSubIncrement},
+ </if>
<if test="(colPickMode==0 and data.containsKey('workScoreAdd')) or (colPickMode==1 and !data.containsKey('workScoreAdd'))">
a.workScoreAdd=#{data.workScoreAdd},
</if>
@@ -250,35 +241,44 @@
<if test="(colPickMode==0 and data.containsKey('otherScoreSubIncrement')) or (colPickMode==1 and !data.containsKey('otherScoreSubIncrement'))">
a.otherScoreSub=ifnull(a.otherScoreSub,0) + #{data.otherScoreSubIncrement},
</if>
+ <if test="(colPickMode==0 and data.containsKey('remark')) or (colPickMode==1 and !data.containsKey('remark'))">
+ a.remark=#{data.remark},
+ </if>
+ <if test="(colPickMode==0 and data.containsKey('year')) or (colPickMode==1 and !data.containsKey('year'))">
+ a.year=#{data.year},
+ </if>
+ <if test="(colPickMode==0 and data.containsKey('yearIncrement')) or (colPickMode==1 and !data.containsKey('yearIncrement'))">
+ a.year=ifnull(a.year,0) + #{data.yearIncrement},
+ </if>
+ <if test="(colPickMode==0 and data.containsKey('month')) or (colPickMode==1 and !data.containsKey('month'))">
+ a.month=#{data.month},
+ </if>
+ <if test="(colPickMode==0 and data.containsKey('monthIncrement')) or (colPickMode==1 and !data.containsKey('monthIncrement'))">
+ a.month=ifnull(a.month,0) + #{data.monthIncrement},
+ </if>
<if test="(colPickMode==0 and data.containsKey('day')) or (colPickMode==1 and !data.containsKey('day'))">
a.day=#{data.day},
</if>
<if test="(colPickMode==0 and data.containsKey('dayIncrement')) or (colPickMode==1 and !data.containsKey('dayIncrement'))">
a.day=ifnull(a.day,0) + #{data.dayIncrement},
</if>
- <if test="(colPickMode==0 and data.containsKey('totalAddScore')) or (colPickMode==1 and !data.containsKey('totalAddScore'))">
- a.totalAddScore=#{data.totalAddScore},
- </if>
- <if test="(colPickMode==0 and data.containsKey('totalAddScoreIncrement')) or (colPickMode==1 and !data.containsKey('totalAddScoreIncrement'))">
- a.totalAddScore=ifnull(a.totalAddScore,0) + #{data.totalAddScoreIncrement},
- </if>
- <if test="(colPickMode==0 and data.containsKey('totalSubScore')) or (colPickMode==1 and !data.containsKey('totalSubScore'))">
- a.totalSubScore=#{data.totalSubScore},
+ <if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
+ a.createTime=#{data.createTime},
</if>
- <if test="(colPickMode==0 and data.containsKey('totalSubScoreIncrement')) or (colPickMode==1 and !data.containsKey('totalSubScoreIncrement'))">
- a.totalSubScore=ifnull(a.totalSubScore,0) + #{data.totalSubScoreIncrement},
+ <if test="(colPickMode==0 and data.containsKey('createUserId')) or (colPickMode==1 and !data.containsKey('createUserId'))">
+ a.createUserId=#{data.createUserId},
</if>
- <if test="(colPickMode==0 and data.containsKey('complainScoreAdd')) or (colPickMode==1 and !data.containsKey('complainScoreAdd'))">
- a.complainScoreAdd=#{data.complainScoreAdd},
+ <if test="(colPickMode==0 and data.containsKey('createUserIdIncrement')) or (colPickMode==1 and !data.containsKey('createUserIdIncrement'))">
+ a.createUserId=ifnull(a.createUserId,0) + #{data.createUserIdIncrement},
</if>
- <if test="(colPickMode==0 and data.containsKey('complainScoreAddIncrement')) or (colPickMode==1 and !data.containsKey('complainScoreAddIncrement'))">
- a.complainScoreAdd=ifnull(a.complainScoreAdd,0) + #{data.complainScoreAddIncrement},
+ <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
+ a.updateTime=#{data.updateTime},
</if>
- <if test="(colPickMode==0 and data.containsKey('complainScoreSub')) or (colPickMode==1 and !data.containsKey('complainScoreSub'))">
- a.complainScoreSub=#{data.complainScoreSub},
+ <if test="(colPickMode==0 and data.containsKey('updateUserId')) or (colPickMode==1 and !data.containsKey('updateUserId'))">
+ a.updateUserId=#{data.updateUserId},
</if>
- <if test="(colPickMode==0 and data.containsKey('complainScoreSubIncrement')) or (colPickMode==1 and !data.containsKey('complainScoreSubIncrement'))">
- a.complainScoreSub=ifnull(a.complainScoreSub,0) + #{data.complainScoreSubIncrement},
+ <if test="(colPickMode==0 and data.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !data.containsKey('updateUserIdIncrement'))">
+ a.updateUserId=ifnull(a.updateUserId,0) + #{data.updateUserIdIncrement},
</if>
</trim>
<trim suffixOverrides="where" suffix="">
@@ -292,286 +292,286 @@
<update id="updateBatch" parameterType="paramDto">
update mortals_xhx_staff_perform_stat as a
<trim prefix="set" suffixOverrides=",">
- <trim prefix="deptId=(case" suffix="ELSE deptId end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <choose>
- <when test="(colPickMode==0 and item.containsKey('deptId')) or (colPickMode==1 and !item.containsKey('deptId'))">
- when a.id=#{item.id} then #{item.deptId}
- </when>
- <when test="(colPickMode==0 and item.containsKey('deptIdIncrement')) or (colPickMode==1 and !item.containsKey('deptIdIncrement'))">
- when a.id=#{item.id} then ifnull(a.deptId,0) + #{item.deptIdIncrement}
- </when>
- </choose>
- </foreach>
- </trim>
- <trim prefix="deptName=(case" suffix="ELSE deptName end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <if test="(colPickMode==0 and item.containsKey('deptName')) or (colPickMode==1 and !item.containsKey('deptName'))">
- when a.id=#{item.id} then #{item.deptName}
- </if>
- </foreach>
- </trim>
- <trim prefix="totalScore=(case" suffix="ELSE totalScore end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <choose>
- <when test="(colPickMode==0 and item.containsKey('totalScore')) or (colPickMode==1 and !item.containsKey('totalScore'))">
- when a.id=#{item.id} then #{item.totalScore}
- </when>
- <when test="(colPickMode==0 and item.containsKey('totalScoreIncrement')) or (colPickMode==1 and !item.containsKey('totalScoreIncrement'))">
- when a.id=#{item.id} then ifnull(a.totalScore,0) + #{item.totalScoreIncrement}
- </when>
- </choose>
- </foreach>
- </trim>
- <trim prefix="remark=(case" suffix="ELSE remark end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <if test="(colPickMode==0 and item.containsKey('remark')) or (colPickMode==1 and !item.containsKey('remark'))">
- when a.id=#{item.id} then #{item.remark}
- </if>
- </foreach>
- </trim>
- <trim prefix="year=(case" suffix="ELSE year end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <choose>
- <when test="(colPickMode==0 and item.containsKey('year')) or (colPickMode==1 and !item.containsKey('year'))">
- when a.id=#{item.id} then #{item.year}
- </when>
- <when test="(colPickMode==0 and item.containsKey('yearIncrement')) or (colPickMode==1 and !item.containsKey('yearIncrement'))">
- when a.id=#{item.id} then ifnull(a.year,0) + #{item.yearIncrement}
- </when>
- </choose>
- </foreach>
- </trim>
- <trim prefix="month=(case" suffix="ELSE month end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <choose>
- <when test="(colPickMode==0 and item.containsKey('month')) or (colPickMode==1 and !item.containsKey('month'))">
- when a.id=#{item.id} then #{item.month}
- </when>
- <when test="(colPickMode==0 and item.containsKey('monthIncrement')) or (colPickMode==1 and !item.containsKey('monthIncrement'))">
- when a.id=#{item.id} then ifnull(a.month,0) + #{item.monthIncrement}
- </when>
- </choose>
- </foreach>
- </trim>
- <trim prefix="createTime=(case" suffix="ELSE createTime end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
- when a.id=#{item.id} then #{item.createTime}
- </if>
- </foreach>
- </trim>
- <trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <choose>
- <when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
- when a.id=#{item.id} then #{item.createUserId}
- </when>
- <when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))">
- when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
- </when>
- </choose>
- </foreach>
- </trim>
- <trim prefix="updateTime=(case" suffix="ELSE updateTime end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))">
- when a.id=#{item.id} then #{item.updateTime}
- </if>
- </foreach>
- </trim>
- <trim prefix="updateUserId=(case" suffix="ELSE updateUserId end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <choose>
- <when test="(colPickMode==0 and item.containsKey('updateUserId')) or (colPickMode==1 and !item.containsKey('updateUserId'))">
- when a.id=#{item.id} then #{item.updateUserId}
- </when>
- <when test="(colPickMode==0 and item.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !item.containsKey('updateUserIdIncrement'))">
- when a.id=#{item.id} then ifnull(a.updateUserId,0) + #{item.updateUserIdIncrement}
- </when>
- </choose>
- </foreach>
- </trim>
- <trim prefix="attendScoreAdd=(case" suffix="ELSE attendScoreAdd end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <choose>
- <when test="(colPickMode==0 and item.containsKey('attendScoreAdd')) or (colPickMode==1 and !item.containsKey('attendScoreAdd'))">
- when a.id=#{item.id} then #{item.attendScoreAdd}
- </when>
- <when test="(colPickMode==0 and item.containsKey('attendScoreAddIncrement')) or (colPickMode==1 and !item.containsKey('attendScoreAddIncrement'))">
- when a.id=#{item.id} then ifnull(a.attendScoreAdd,0) + #{item.attendScoreAddIncrement}
- </when>
- </choose>
- </foreach>
- </trim>
- <trim prefix="attendScoreSub=(case" suffix="ELSE attendScoreSub end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <choose>
- <when test="(colPickMode==0 and item.containsKey('attendScoreSub')) or (colPickMode==1 and !item.containsKey('attendScoreSub'))">
- when a.id=#{item.id} then #{item.attendScoreSub}
- </when>
- <when test="(colPickMode==0 and item.containsKey('attendScoreSubIncrement')) or (colPickMode==1 and !item.containsKey('attendScoreSubIncrement'))">
- when a.id=#{item.id} then ifnull(a.attendScoreSub,0) + #{item.attendScoreSubIncrement}
- </when>
- </choose>
- </foreach>
- </trim>
- <trim prefix="assessScoreAdd=(case" suffix="ELSE assessScoreAdd end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <choose>
- <when test="(colPickMode==0 and item.containsKey('assessScoreAdd')) or (colPickMode==1 and !item.containsKey('assessScoreAdd'))">
- when a.id=#{item.id} then #{item.assessScoreAdd}
- </when>
- <when test="(colPickMode==0 and item.containsKey('assessScoreAddIncrement')) or (colPickMode==1 and !item.containsKey('assessScoreAddIncrement'))">
- when a.id=#{item.id} then ifnull(a.assessScoreAdd,0) + #{item.assessScoreAddIncrement}
- </when>
- </choose>
- </foreach>
- </trim>
- <trim prefix="assessScoreSub=(case" suffix="ELSE assessScoreSub end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <choose>
- <when test="(colPickMode==0 and item.containsKey('assessScoreSub')) or (colPickMode==1 and !item.containsKey('assessScoreSub'))">
- when a.id=#{item.id} then #{item.assessScoreSub}
- </when>
- <when test="(colPickMode==0 and item.containsKey('assessScoreSubIncrement')) or (colPickMode==1 and !item.containsKey('assessScoreSubIncrement'))">
- when a.id=#{item.id} then ifnull(a.assessScoreSub,0) + #{item.assessScoreSubIncrement}
- </when>
- </choose>
- </foreach>
- </trim>
- <trim prefix="workScoreAdd=(case" suffix="ELSE workScoreAdd end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <choose>
- <when test="(colPickMode==0 and item.containsKey('workScoreAdd')) or (colPickMode==1 and !item.containsKey('workScoreAdd'))">
- when a.id=#{item.id} then #{item.workScoreAdd}
- </when>
- <when test="(colPickMode==0 and item.containsKey('workScoreAddIncrement')) or (colPickMode==1 and !item.containsKey('workScoreAddIncrement'))">
- when a.id=#{item.id} then ifnull(a.workScoreAdd,0) + #{item.workScoreAddIncrement}
- </when>
- </choose>
- </foreach>
- </trim>
- <trim prefix="workScoreSub=(case" suffix="ELSE workScoreSub end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <choose>
- <when test="(colPickMode==0 and item.containsKey('workScoreSub')) or (colPickMode==1 and !item.containsKey('workScoreSub'))">
- when a.id=#{item.id} then #{item.workScoreSub}
- </when>
- <when test="(colPickMode==0 and item.containsKey('workScoreSubIncrement')) or (colPickMode==1 and !item.containsKey('workScoreSubIncrement'))">
- when a.id=#{item.id} then ifnull(a.workScoreSub,0) + #{item.workScoreSubIncrement}
- </when>
- </choose>
- </foreach>
- </trim>
- <trim prefix="effectScoreAdd=(case" suffix="ELSE effectScoreAdd end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <choose>
- <when test="(colPickMode==0 and item.containsKey('effectScoreAdd')) or (colPickMode==1 and !item.containsKey('effectScoreAdd'))">
- when a.id=#{item.id} then #{item.effectScoreAdd}
- </when>
- <when test="(colPickMode==0 and item.containsKey('effectScoreAddIncrement')) or (colPickMode==1 and !item.containsKey('effectScoreAddIncrement'))">
- when a.id=#{item.id} then ifnull(a.effectScoreAdd,0) + #{item.effectScoreAddIncrement}
- </when>
- </choose>
- </foreach>
- </trim>
- <trim prefix="effectScoreSub=(case" suffix="ELSE effectScoreSub end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <choose>
- <when test="(colPickMode==0 and item.containsKey('effectScoreSub')) or (colPickMode==1 and !item.containsKey('effectScoreSub'))">
- when a.id=#{item.id} then #{item.effectScoreSub}
- </when>
- <when test="(colPickMode==0 and item.containsKey('effectScoreSubIncrement')) or (colPickMode==1 and !item.containsKey('effectScoreSubIncrement'))">
- when a.id=#{item.id} then ifnull(a.effectScoreSub,0) + #{item.effectScoreSubIncrement}
- </when>
- </choose>
- </foreach>
- </trim>
- <trim prefix="otherScoreAdd=(case" suffix="ELSE otherScoreAdd end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <choose>
- <when test="(colPickMode==0 and item.containsKey('otherScoreAdd')) or (colPickMode==1 and !item.containsKey('otherScoreAdd'))">
- when a.id=#{item.id} then #{item.otherScoreAdd}
- </when>
- <when test="(colPickMode==0 and item.containsKey('otherScoreAddIncrement')) or (colPickMode==1 and !item.containsKey('otherScoreAddIncrement'))">
- when a.id=#{item.id} then ifnull(a.otherScoreAdd,0) + #{item.otherScoreAddIncrement}
- </when>
- </choose>
- </foreach>
- </trim>
- <trim prefix="otherScoreSub=(case" suffix="ELSE otherScoreSub end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <choose>
- <when test="(colPickMode==0 and item.containsKey('otherScoreSub')) or (colPickMode==1 and !item.containsKey('otherScoreSub'))">
- when a.id=#{item.id} then #{item.otherScoreSub}
- </when>
- <when test="(colPickMode==0 and item.containsKey('otherScoreSubIncrement')) or (colPickMode==1 and !item.containsKey('otherScoreSubIncrement'))">
- when a.id=#{item.id} then ifnull(a.otherScoreSub,0) + #{item.otherScoreSubIncrement}
- </when>
- </choose>
- </foreach>
- </trim>
- <trim prefix="day=(case" suffix="ELSE day end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <choose>
- <when test="(colPickMode==0 and item.containsKey('day')) or (colPickMode==1 and !item.containsKey('day'))">
- when a.id=#{item.id} then #{item.day}
- </when>
- <when test="(colPickMode==0 and item.containsKey('dayIncrement')) or (colPickMode==1 and !item.containsKey('dayIncrement'))">
- when a.id=#{item.id} then ifnull(a.day,0) + #{item.dayIncrement}
- </when>
- </choose>
- </foreach>
- </trim>
- <trim prefix="totalAddScore=(case" suffix="ELSE totalAddScore end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <choose>
- <when test="(colPickMode==0 and item.containsKey('totalAddScore')) or (colPickMode==1 and !item.containsKey('totalAddScore'))">
- when a.id=#{item.id} then #{item.totalAddScore}
- </when>
- <when test="(colPickMode==0 and item.containsKey('totalAddScoreIncrement')) or (colPickMode==1 and !item.containsKey('totalAddScoreIncrement'))">
- when a.id=#{item.id} then ifnull(a.totalAddScore,0) + #{item.totalAddScoreIncrement}
- </when>
- </choose>
- </foreach>
- </trim>
- <trim prefix="totalSubScore=(case" suffix="ELSE totalSubScore end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <choose>
- <when test="(colPickMode==0 and item.containsKey('totalSubScore')) or (colPickMode==1 and !item.containsKey('totalSubScore'))">
- when a.id=#{item.id} then #{item.totalSubScore}
- </when>
- <when test="(colPickMode==0 and item.containsKey('totalSubScoreIncrement')) or (colPickMode==1 and !item.containsKey('totalSubScoreIncrement'))">
- when a.id=#{item.id} then ifnull(a.totalSubScore,0) + #{item.totalSubScoreIncrement}
- </when>
- </choose>
- </foreach>
- </trim>
- <trim prefix="complainScoreAdd=(case" suffix="ELSE complainScoreAdd end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <choose>
- <when test="(colPickMode==0 and item.containsKey('complainScoreAdd')) or (colPickMode==1 and !item.containsKey('complainScoreAdd'))">
- when a.id=#{item.id} then #{item.complainScoreAdd}
- </when>
- <when test="(colPickMode==0 and item.containsKey('complainScoreAddIncrement')) or (colPickMode==1 and !item.containsKey('complainScoreAddIncrement'))">
- when a.id=#{item.id} then ifnull(a.complainScoreAdd,0) + #{item.complainScoreAddIncrement}
- </when>
- </choose>
- </foreach>
- </trim>
- <trim prefix="complainScoreSub=(case" suffix="ELSE complainScoreSub end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <choose>
- <when test="(colPickMode==0 and item.containsKey('complainScoreSub')) or (colPickMode==1 and !item.containsKey('complainScoreSub'))">
- when a.id=#{item.id} then #{item.complainScoreSub}
- </when>
- <when test="(colPickMode==0 and item.containsKey('complainScoreSubIncrement')) or (colPickMode==1 and !item.containsKey('complainScoreSubIncrement'))">
- when a.id=#{item.id} then ifnull(a.complainScoreSub,0) + #{item.complainScoreSubIncrement}
- </when>
- </choose>
- </foreach>
- </trim>
+ <trim prefix="staffId=(case" suffix="ELSE staffId end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <choose>
+ <when test="(colPickMode==0 and item.containsKey('staffId')) or (colPickMode==1 and !item.containsKey('staffId'))">
+ when a.id=#{item.id} then #{item.staffId}
+ </when>
+ <when test="(colPickMode==0 and item.containsKey('staffIdIncrement')) or (colPickMode==1 and !item.containsKey('staffIdIncrement'))">
+ when a.id=#{item.id} then ifnull(a.staffId,0) + #{item.staffIdIncrement}
+ </when>
+ </choose>
+ </foreach>
+ </trim>
+ <trim prefix="staffName=(case" suffix="ELSE staffName end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <if test="(colPickMode==0 and item.containsKey('staffName')) or (colPickMode==1 and !item.containsKey('staffName'))">
+ when a.id=#{item.id} then #{item.staffName}
+ </if>
+ </foreach>
+ </trim>
+ <trim prefix="totalScore=(case" suffix="ELSE totalScore end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <choose>
+ <when test="(colPickMode==0 and item.containsKey('totalScore')) or (colPickMode==1 and !item.containsKey('totalScore'))">
+ when a.id=#{item.id} then #{item.totalScore}
+ </when>
+ <when test="(colPickMode==0 and item.containsKey('totalScoreIncrement')) or (colPickMode==1 and !item.containsKey('totalScoreIncrement'))">
+ when a.id=#{item.id} then ifnull(a.totalScore,0) + #{item.totalScoreIncrement}
+ </when>
+ </choose>
+ </foreach>
+ </trim>
+ <trim prefix="totalAddScore=(case" suffix="ELSE totalAddScore end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <choose>
+ <when test="(colPickMode==0 and item.containsKey('totalAddScore')) or (colPickMode==1 and !item.containsKey('totalAddScore'))">
+ when a.id=#{item.id} then #{item.totalAddScore}
+ </when>
+ <when test="(colPickMode==0 and item.containsKey('totalAddScoreIncrement')) or (colPickMode==1 and !item.containsKey('totalAddScoreIncrement'))">
+ when a.id=#{item.id} then ifnull(a.totalAddScore,0) + #{item.totalAddScoreIncrement}
+ </when>
+ </choose>
+ </foreach>
+ </trim>
+ <trim prefix="totalSubScore=(case" suffix="ELSE totalSubScore end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <choose>
+ <when test="(colPickMode==0 and item.containsKey('totalSubScore')) or (colPickMode==1 and !item.containsKey('totalSubScore'))">
+ when a.id=#{item.id} then #{item.totalSubScore}
+ </when>
+ <when test="(colPickMode==0 and item.containsKey('totalSubScoreIncrement')) or (colPickMode==1 and !item.containsKey('totalSubScoreIncrement'))">
+ when a.id=#{item.id} then ifnull(a.totalSubScore,0) + #{item.totalSubScoreIncrement}
+ </when>
+ </choose>
+ </foreach>
+ </trim>
+ <trim prefix="attendScoreAdd=(case" suffix="ELSE attendScoreAdd end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <choose>
+ <when test="(colPickMode==0 and item.containsKey('attendScoreAdd')) or (colPickMode==1 and !item.containsKey('attendScoreAdd'))">
+ when a.id=#{item.id} then #{item.attendScoreAdd}
+ </when>
+ <when test="(colPickMode==0 and item.containsKey('attendScoreAddIncrement')) or (colPickMode==1 and !item.containsKey('attendScoreAddIncrement'))">
+ when a.id=#{item.id} then ifnull(a.attendScoreAdd,0) + #{item.attendScoreAddIncrement}
+ </when>
+ </choose>
+ </foreach>
+ </trim>
+ <trim prefix="attendScoreSub=(case" suffix="ELSE attendScoreSub end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <choose>
+ <when test="(colPickMode==0 and item.containsKey('attendScoreSub')) or (colPickMode==1 and !item.containsKey('attendScoreSub'))">
+ when a.id=#{item.id} then #{item.attendScoreSub}
+ </when>
+ <when test="(colPickMode==0 and item.containsKey('attendScoreSubIncrement')) or (colPickMode==1 and !item.containsKey('attendScoreSubIncrement'))">
+ when a.id=#{item.id} then ifnull(a.attendScoreSub,0) + #{item.attendScoreSubIncrement}
+ </when>
+ </choose>
+ </foreach>
+ </trim>
+ <trim prefix="assessScoreAdd=(case" suffix="ELSE assessScoreAdd end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <choose>
+ <when test="(colPickMode==0 and item.containsKey('assessScoreAdd')) or (colPickMode==1 and !item.containsKey('assessScoreAdd'))">
+ when a.id=#{item.id} then #{item.assessScoreAdd}
+ </when>
+ <when test="(colPickMode==0 and item.containsKey('assessScoreAddIncrement')) or (colPickMode==1 and !item.containsKey('assessScoreAddIncrement'))">
+ when a.id=#{item.id} then ifnull(a.assessScoreAdd,0) + #{item.assessScoreAddIncrement}
+ </when>
+ </choose>
+ </foreach>
+ </trim>
+ <trim prefix="assessScoreSub=(case" suffix="ELSE assessScoreSub end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <choose>
+ <when test="(colPickMode==0 and item.containsKey('assessScoreSub')) or (colPickMode==1 and !item.containsKey('assessScoreSub'))">
+ when a.id=#{item.id} then #{item.assessScoreSub}
+ </when>
+ <when test="(colPickMode==0 and item.containsKey('assessScoreSubIncrement')) or (colPickMode==1 and !item.containsKey('assessScoreSubIncrement'))">
+ when a.id=#{item.id} then ifnull(a.assessScoreSub,0) + #{item.assessScoreSubIncrement}
+ </when>
+ </choose>
+ </foreach>
+ </trim>
+ <trim prefix="complainScoreAdd=(case" suffix="ELSE complainScoreAdd end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <choose>
+ <when test="(colPickMode==0 and item.containsKey('complainScoreAdd')) or (colPickMode==1 and !item.containsKey('complainScoreAdd'))">
+ when a.id=#{item.id} then #{item.complainScoreAdd}
+ </when>
+ <when test="(colPickMode==0 and item.containsKey('complainScoreAddIncrement')) or (colPickMode==1 and !item.containsKey('complainScoreAddIncrement'))">
+ when a.id=#{item.id} then ifnull(a.complainScoreAdd,0) + #{item.complainScoreAddIncrement}
+ </when>
+ </choose>
+ </foreach>
+ </trim>
+ <trim prefix="complainScoreSub=(case" suffix="ELSE complainScoreSub end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <choose>
+ <when test="(colPickMode==0 and item.containsKey('complainScoreSub')) or (colPickMode==1 and !item.containsKey('complainScoreSub'))">
+ when a.id=#{item.id} then #{item.complainScoreSub}
+ </when>
+ <when test="(colPickMode==0 and item.containsKey('complainScoreSubIncrement')) or (colPickMode==1 and !item.containsKey('complainScoreSubIncrement'))">
+ when a.id=#{item.id} then ifnull(a.complainScoreSub,0) + #{item.complainScoreSubIncrement}
+ </when>
+ </choose>
+ </foreach>
+ </trim>
+ <trim prefix="workScoreAdd=(case" suffix="ELSE workScoreAdd end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <choose>
+ <when test="(colPickMode==0 and item.containsKey('workScoreAdd')) or (colPickMode==1 and !item.containsKey('workScoreAdd'))">
+ when a.id=#{item.id} then #{item.workScoreAdd}
+ </when>
+ <when test="(colPickMode==0 and item.containsKey('workScoreAddIncrement')) or (colPickMode==1 and !item.containsKey('workScoreAddIncrement'))">
+ when a.id=#{item.id} then ifnull(a.workScoreAdd,0) + #{item.workScoreAddIncrement}
+ </when>
+ </choose>
+ </foreach>
+ </trim>
+ <trim prefix="workScoreSub=(case" suffix="ELSE workScoreSub end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <choose>
+ <when test="(colPickMode==0 and item.containsKey('workScoreSub')) or (colPickMode==1 and !item.containsKey('workScoreSub'))">
+ when a.id=#{item.id} then #{item.workScoreSub}
+ </when>
+ <when test="(colPickMode==0 and item.containsKey('workScoreSubIncrement')) or (colPickMode==1 and !item.containsKey('workScoreSubIncrement'))">
+ when a.id=#{item.id} then ifnull(a.workScoreSub,0) + #{item.workScoreSubIncrement}
+ </when>
+ </choose>
+ </foreach>
+ </trim>
+ <trim prefix="effectScoreAdd=(case" suffix="ELSE effectScoreAdd end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <choose>
+ <when test="(colPickMode==0 and item.containsKey('effectScoreAdd')) or (colPickMode==1 and !item.containsKey('effectScoreAdd'))">
+ when a.id=#{item.id} then #{item.effectScoreAdd}
+ </when>
+ <when test="(colPickMode==0 and item.containsKey('effectScoreAddIncrement')) or (colPickMode==1 and !item.containsKey('effectScoreAddIncrement'))">
+ when a.id=#{item.id} then ifnull(a.effectScoreAdd,0) + #{item.effectScoreAddIncrement}
+ </when>
+ </choose>
+ </foreach>
+ </trim>
+ <trim prefix="effectScoreSub=(case" suffix="ELSE effectScoreSub end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <choose>
+ <when test="(colPickMode==0 and item.containsKey('effectScoreSub')) or (colPickMode==1 and !item.containsKey('effectScoreSub'))">
+ when a.id=#{item.id} then #{item.effectScoreSub}
+ </when>
+ <when test="(colPickMode==0 and item.containsKey('effectScoreSubIncrement')) or (colPickMode==1 and !item.containsKey('effectScoreSubIncrement'))">
+ when a.id=#{item.id} then ifnull(a.effectScoreSub,0) + #{item.effectScoreSubIncrement}
+ </when>
+ </choose>
+ </foreach>
+ </trim>
+ <trim prefix="otherScoreAdd=(case" suffix="ELSE otherScoreAdd end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <choose>
+ <when test="(colPickMode==0 and item.containsKey('otherScoreAdd')) or (colPickMode==1 and !item.containsKey('otherScoreAdd'))">
+ when a.id=#{item.id} then #{item.otherScoreAdd}
+ </when>
+ <when test="(colPickMode==0 and item.containsKey('otherScoreAddIncrement')) or (colPickMode==1 and !item.containsKey('otherScoreAddIncrement'))">
+ when a.id=#{item.id} then ifnull(a.otherScoreAdd,0) + #{item.otherScoreAddIncrement}
+ </when>
+ </choose>
+ </foreach>
+ </trim>
+ <trim prefix="otherScoreSub=(case" suffix="ELSE otherScoreSub end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <choose>
+ <when test="(colPickMode==0 and item.containsKey('otherScoreSub')) or (colPickMode==1 and !item.containsKey('otherScoreSub'))">
+ when a.id=#{item.id} then #{item.otherScoreSub}
+ </when>
+ <when test="(colPickMode==0 and item.containsKey('otherScoreSubIncrement')) or (colPickMode==1 and !item.containsKey('otherScoreSubIncrement'))">
+ when a.id=#{item.id} then ifnull(a.otherScoreSub,0) + #{item.otherScoreSubIncrement}
+ </when>
+ </choose>
+ </foreach>
+ </trim>
+ <trim prefix="remark=(case" suffix="ELSE remark end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <if test="(colPickMode==0 and item.containsKey('remark')) or (colPickMode==1 and !item.containsKey('remark'))">
+ when a.id=#{item.id} then #{item.remark}
+ </if>
+ </foreach>
+ </trim>
+ <trim prefix="year=(case" suffix="ELSE year end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <choose>
+ <when test="(colPickMode==0 and item.containsKey('year')) or (colPickMode==1 and !item.containsKey('year'))">
+ when a.id=#{item.id} then #{item.year}
+ </when>
+ <when test="(colPickMode==0 and item.containsKey('yearIncrement')) or (colPickMode==1 and !item.containsKey('yearIncrement'))">
+ when a.id=#{item.id} then ifnull(a.year,0) + #{item.yearIncrement}
+ </when>
+ </choose>
+ </foreach>
+ </trim>
+ <trim prefix="month=(case" suffix="ELSE month end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <choose>
+ <when test="(colPickMode==0 and item.containsKey('month')) or (colPickMode==1 and !item.containsKey('month'))">
+ when a.id=#{item.id} then #{item.month}
+ </when>
+ <when test="(colPickMode==0 and item.containsKey('monthIncrement')) or (colPickMode==1 and !item.containsKey('monthIncrement'))">
+ when a.id=#{item.id} then ifnull(a.month,0) + #{item.monthIncrement}
+ </when>
+ </choose>
+ </foreach>
+ </trim>
+ <trim prefix="day=(case" suffix="ELSE day end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <choose>
+ <when test="(colPickMode==0 and item.containsKey('day')) or (colPickMode==1 and !item.containsKey('day'))">
+ when a.id=#{item.id} then #{item.day}
+ </when>
+ <when test="(colPickMode==0 and item.containsKey('dayIncrement')) or (colPickMode==1 and !item.containsKey('dayIncrement'))">
+ when a.id=#{item.id} then ifnull(a.day,0) + #{item.dayIncrement}
+ </when>
+ </choose>
+ </foreach>
+ </trim>
+ <trim prefix="createTime=(case" suffix="ELSE createTime end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
+ when a.id=#{item.id} then #{item.createTime}
+ </if>
+ </foreach>
+ </trim>
+ <trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <choose>
+ <when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
+ when a.id=#{item.id} then #{item.createUserId}
+ </when>
+ <when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))">
+ when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
+ </when>
+ </choose>
+ </foreach>
+ </trim>
+ <trim prefix="updateTime=(case" suffix="ELSE updateTime end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))">
+ when a.id=#{item.id} then #{item.updateTime}
+ </if>
+ </foreach>
+ </trim>
+ <trim prefix="updateUserId=(case" suffix="ELSE updateUserId end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <choose>
+ <when test="(colPickMode==0 and item.containsKey('updateUserId')) or (colPickMode==1 and !item.containsKey('updateUserId'))">
+ when a.id=#{item.id} then #{item.updateUserId}
+ </when>
+ <when test="(colPickMode==0 and item.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !item.containsKey('updateUserIdIncrement'))">
+ when a.id=#{item.id} then ifnull(a.updateUserId,0) + #{item.updateUserIdIncrement}
+ </when>
+ </choose>
+ </foreach>
+ </trim>
</trim>
where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -688,671 +688,671 @@
${_conditionType_} a.id=#{${_conditionParam_}.id}
</if>
</if>
- <if test="conditionParamRef.containsKey('id')">
- <if test="conditionParamRef.id != null ">
- ${_conditionType_} a.id = #{${_conditionParam_}.id}
- </if>
- <if test="conditionParamRef.id == null">
- ${_conditionType_} a.id is null
- </if>
- </if>
- <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
- ${_conditionType_} a.id in
- <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('idNotList') and conditionParamRef.idNotList.size() > 0">
- ${_conditionType_} a.id not in
- <foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
- ${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
+ <if test="conditionParamRef.containsKey('id')">
+ <if test="conditionParamRef.id != null ">
+ ${_conditionType_} a.id = #{${_conditionParam_}.id}
</if>
- <if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null">
- ${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
+ <if test="conditionParamRef.id == null">
+ ${_conditionType_} a.id is null
</if>
+ </if>
+ <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
+ ${_conditionType_} a.id in
+ <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('idNotList') and conditionParamRef.idNotList.size() > 0">
+ ${_conditionType_} a.id not in
+ <foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
+ ${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
+ </if>
+ <if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null">
+ ${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
+ </if>
- <if test="conditionParamRef.containsKey('deptId')">
- <if test="conditionParamRef.deptId != null ">
- ${_conditionType_} a.deptId = #{${_conditionParam_}.deptId}
- </if>
- <if test="conditionParamRef.deptId == null">
- ${_conditionType_} a.deptId is null
- </if>
+ <if test="conditionParamRef.containsKey('staffId')">
+ <if test="conditionParamRef.staffId != null ">
+ ${_conditionType_} a.staffId = #{${_conditionParam_}.staffId}
</if>
- <if test="conditionParamRef.containsKey('deptIdList') and conditionParamRef.deptIdList.size() > 0">
- ${_conditionType_} a.deptId in
- <foreach collection="conditionParamRef.deptIdList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('deptIdNotList') and conditionParamRef.deptIdNotList.size() > 0">
- ${_conditionType_} a.deptId not in
- <foreach collection="conditionParamRef.deptIdNotList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('deptIdStart') and conditionParamRef.deptIdStart != null">
- ${_conditionType_} a.deptId <![CDATA[ >= ]]> #{${_conditionParam_}.deptIdStart}
- </if>
- <if test="conditionParamRef.containsKey('deptIdEnd') and conditionParamRef.deptIdEnd != null">
- ${_conditionType_} a.deptId <![CDATA[ <= ]]> #{${_conditionParam_}.deptIdEnd}
+ <if test="conditionParamRef.staffId == null">
+ ${_conditionType_} a.staffId is null
</if>
+ </if>
+ <if test="conditionParamRef.containsKey('staffIdList') and conditionParamRef.staffIdList.size() > 0">
+ ${_conditionType_} a.staffId in
+ <foreach collection="conditionParamRef.staffIdList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('staffIdNotList') and conditionParamRef.staffIdNotList.size() > 0">
+ ${_conditionType_} a.staffId not in
+ <foreach collection="conditionParamRef.staffIdNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('staffIdStart') and conditionParamRef.staffIdStart != null">
+ ${_conditionType_} a.staffId <![CDATA[ >= ]]> #{${_conditionParam_}.staffIdStart}
+ </if>
+ <if test="conditionParamRef.containsKey('staffIdEnd') and conditionParamRef.staffIdEnd != null">
+ ${_conditionType_} a.staffId <![CDATA[ <= ]]> #{${_conditionParam_}.staffIdEnd}
+ </if>
- <if test="conditionParamRef.containsKey('deptName')">
- <if test="conditionParamRef.deptName != null and conditionParamRef.deptName != ''">
- ${_conditionType_} a.deptName like #{${_conditionParam_}.deptName}
- </if>
- <if test="conditionParamRef.deptName == null">
- ${_conditionType_} a.deptName is null
- </if>
- </if>
- <if test="conditionParamRef.containsKey('deptNameList') and conditionParamRef.deptNameList.size() > 0">
- ${_conditionType_} a.deptName in
- <foreach collection="conditionParamRef.deptNameList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('deptNameNotList') and conditionParamRef.deptNameNotList.size() > 0">
- ${_conditionType_} a.deptName not in
- <foreach collection="conditionParamRef.deptNameNotList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
+ <if test="conditionParamRef.containsKey('staffName')">
+ <if test="conditionParamRef.staffName != null and conditionParamRef.staffName != ''">
+ ${_conditionType_} a.staffName like #{${_conditionParam_}.staffName}
</if>
- <if test="conditionParamRef.containsKey('totalScore')">
- <if test="conditionParamRef.totalScore != null ">
- ${_conditionType_} a.totalScore = #{${_conditionParam_}.totalScore}
- </if>
- <if test="conditionParamRef.totalScore == null">
- ${_conditionType_} a.totalScore is null
- </if>
+ <if test="conditionParamRef.staffName == null">
+ ${_conditionType_} a.staffName is null
</if>
- <if test="conditionParamRef.containsKey('totalScoreList') and conditionParamRef.totalScoreList.size() > 0">
- ${_conditionType_} a.totalScore in
- <foreach collection="conditionParamRef.totalScoreList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('staffNameList') and conditionParamRef.staffNameList.size() > 0">
+ ${_conditionType_} a.staffName in
+ <foreach collection="conditionParamRef.staffNameList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('staffNameNotList') and conditionParamRef.staffNameNotList.size() > 0">
+ ${_conditionType_} a.staffName not in
+ <foreach collection="conditionParamRef.staffNameNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('totalScore')">
+ <if test="conditionParamRef.totalScore != null ">
+ ${_conditionType_} a.totalScore = #{${_conditionParam_}.totalScore}
</if>
- <if test="conditionParamRef.containsKey('totalScoreNotList') and conditionParamRef.totalScoreNotList.size() > 0">
- ${_conditionType_} a.totalScore not in
- <foreach collection="conditionParamRef.totalScoreNotList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
+ <if test="conditionParamRef.totalScore == null">
+ ${_conditionType_} a.totalScore is null
</if>
- <if test="conditionParamRef.containsKey('totalScoreStart') and conditionParamRef.totalScoreStart != null">
- ${_conditionType_} a.totalScore <![CDATA[ >= ]]> #{${_conditionParam_}.totalScoreStart}
+ </if>
+ <if test="conditionParamRef.containsKey('totalScoreList') and conditionParamRef.totalScoreList.size() > 0">
+ ${_conditionType_} a.totalScore in
+ <foreach collection="conditionParamRef.totalScoreList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('totalScoreNotList') and conditionParamRef.totalScoreNotList.size() > 0">
+ ${_conditionType_} a.totalScore not in
+ <foreach collection="conditionParamRef.totalScoreNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('totalScoreStart') and conditionParamRef.totalScoreStart != null">
+ ${_conditionType_} a.totalScore <![CDATA[ >= ]]> #{${_conditionParam_}.totalScoreStart}
+ </if>
+ <if test="conditionParamRef.containsKey('totalScoreEnd') and conditionParamRef.totalScoreEnd != null">
+ ${_conditionType_} a.totalScore <![CDATA[ <= ]]> #{${_conditionParam_}.totalScoreEnd}
+ </if>
+
+ <if test="conditionParamRef.containsKey('totalAddScore')">
+ <if test="conditionParamRef.totalAddScore != null ">
+ ${_conditionType_} a.totalAddScore = #{${_conditionParam_}.totalAddScore}
</if>
- <if test="conditionParamRef.containsKey('totalScoreEnd') and conditionParamRef.totalScoreEnd != null">
- ${_conditionType_} a.totalScore <![CDATA[ <= ]]> #{${_conditionParam_}.totalScoreEnd}
+ <if test="conditionParamRef.totalAddScore == null">
+ ${_conditionType_} a.totalAddScore is null
</if>
+ </if>
+ <if test="conditionParamRef.containsKey('totalAddScoreList') and conditionParamRef.totalAddScoreList.size() > 0">
+ ${_conditionType_} a.totalAddScore in
+ <foreach collection="conditionParamRef.totalAddScoreList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('totalAddScoreNotList') and conditionParamRef.totalAddScoreNotList.size() > 0">
+ ${_conditionType_} a.totalAddScore not in
+ <foreach collection="conditionParamRef.totalAddScoreNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('totalAddScoreStart') and conditionParamRef.totalAddScoreStart != null">
+ ${_conditionType_} a.totalAddScore <![CDATA[ >= ]]> #{${_conditionParam_}.totalAddScoreStart}
+ </if>
+ <if test="conditionParamRef.containsKey('totalAddScoreEnd') and conditionParamRef.totalAddScoreEnd != null">
+ ${_conditionType_} a.totalAddScore <![CDATA[ <= ]]> #{${_conditionParam_}.totalAddScoreEnd}
+ </if>
-
- <if test="conditionParamRef.containsKey('remark')">
- <if test="conditionParamRef.remark != null and conditionParamRef.remark != ''">
- ${_conditionType_} a.remark like #{${_conditionParam_}.remark}
- </if>
- <if test="conditionParamRef.remark == null">
- ${_conditionType_} a.remark is null
- </if>
- </if>
- <if test="conditionParamRef.containsKey('remarkList') and conditionParamRef.remarkList.size() > 0">
- ${_conditionType_} a.remark in
- <foreach collection="conditionParamRef.remarkList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
+ <if test="conditionParamRef.containsKey('totalSubScore')">
+ <if test="conditionParamRef.totalSubScore != null ">
+ ${_conditionType_} a.totalSubScore = #{${_conditionParam_}.totalSubScore}
</if>
- <if test="conditionParamRef.containsKey('remarkNotList') and conditionParamRef.remarkNotList.size() > 0">
- ${_conditionType_} a.remark not in
- <foreach collection="conditionParamRef.remarkNotList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('year')">
- <if test="conditionParamRef.year != null ">
- ${_conditionType_} a.year = #{${_conditionParam_}.year}
- </if>
- <if test="conditionParamRef.year == null">
- ${_conditionType_} a.year is null
- </if>
- </if>
- <if test="conditionParamRef.containsKey('yearList') and conditionParamRef.yearList.size() > 0">
- ${_conditionType_} a.year in
- <foreach collection="conditionParamRef.yearList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('yearNotList') and conditionParamRef.yearNotList.size() > 0">
- ${_conditionType_} a.year not in
- <foreach collection="conditionParamRef.yearNotList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('yearStart') and conditionParamRef.yearStart != null">
- ${_conditionType_} a.year <![CDATA[ >= ]]> #{${_conditionParam_}.yearStart}
- </if>
- <if test="conditionParamRef.containsKey('yearEnd') and conditionParamRef.yearEnd != null">
- ${_conditionType_} a.year <![CDATA[ <= ]]> #{${_conditionParam_}.yearEnd}
+ <if test="conditionParamRef.totalSubScore == null">
+ ${_conditionType_} a.totalSubScore is null
</if>
+ </if>
+ <if test="conditionParamRef.containsKey('totalSubScoreList') and conditionParamRef.totalSubScoreList.size() > 0">
+ ${_conditionType_} a.totalSubScore in
+ <foreach collection="conditionParamRef.totalSubScoreList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('totalSubScoreNotList') and conditionParamRef.totalSubScoreNotList.size() > 0">
+ ${_conditionType_} a.totalSubScore not in
+ <foreach collection="conditionParamRef.totalSubScoreNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('totalSubScoreStart') and conditionParamRef.totalSubScoreStart != null">
+ ${_conditionType_} a.totalSubScore <![CDATA[ >= ]]> #{${_conditionParam_}.totalSubScoreStart}
+ </if>
+ <if test="conditionParamRef.containsKey('totalSubScoreEnd') and conditionParamRef.totalSubScoreEnd != null">
+ ${_conditionType_} a.totalSubScore <![CDATA[ <= ]]> #{${_conditionParam_}.totalSubScoreEnd}
+ </if>
- <if test="conditionParamRef.containsKey('month')">
- <if test="conditionParamRef.month != null ">
- ${_conditionType_} a.month = #{${_conditionParam_}.month}
- </if>
- <if test="conditionParamRef.month == null">
- ${_conditionType_} a.month is null
- </if>
- </if>
- <if test="conditionParamRef.containsKey('monthList') and conditionParamRef.monthList.size() > 0">
- ${_conditionType_} a.month in
- <foreach collection="conditionParamRef.monthList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('monthNotList') and conditionParamRef.monthNotList.size() > 0">
- ${_conditionType_} a.month not in
- <foreach collection="conditionParamRef.monthNotList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
+ <if test="conditionParamRef.containsKey('attendScoreAdd')">
+ <if test="conditionParamRef.attendScoreAdd != null ">
+ ${_conditionType_} a.attendScoreAdd = #{${_conditionParam_}.attendScoreAdd}
</if>
- <if test="conditionParamRef.containsKey('monthStart') and conditionParamRef.monthStart != null">
- ${_conditionType_} a.month <![CDATA[ >= ]]> #{${_conditionParam_}.monthStart}
+ <if test="conditionParamRef.attendScoreAdd == null">
+ ${_conditionType_} a.attendScoreAdd is null
</if>
- <if test="conditionParamRef.containsKey('monthEnd') and conditionParamRef.monthEnd != null">
- ${_conditionType_} a.month <![CDATA[ <= ]]> #{${_conditionParam_}.monthEnd}
- </if>
-
+ </if>
+ <if test="conditionParamRef.containsKey('attendScoreAddList') and conditionParamRef.attendScoreAddList.size() > 0">
+ ${_conditionType_} a.attendScoreAdd in
+ <foreach collection="conditionParamRef.attendScoreAddList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('attendScoreAddNotList') and conditionParamRef.attendScoreAddNotList.size() > 0">
+ ${_conditionType_} a.attendScoreAdd not in
+ <foreach collection="conditionParamRef.attendScoreAddNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('attendScoreAddStart') and conditionParamRef.attendScoreAddStart != null">
+ ${_conditionType_} a.attendScoreAdd <![CDATA[ >= ]]> #{${_conditionParam_}.attendScoreAddStart}
+ </if>
+ <if test="conditionParamRef.containsKey('attendScoreAddEnd') and conditionParamRef.attendScoreAddEnd != null">
+ ${_conditionType_} a.attendScoreAdd <![CDATA[ <= ]]> #{${_conditionParam_}.attendScoreAddEnd}
+ </if>
- <if test="conditionParamRef.containsKey('createTime')">
- <if test="conditionParamRef.createTime != null ">
- ${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
- </if>
- <if test="conditionParamRef.createTime == null">
- ${_conditionType_} a.createTime is null
- </if>
- </if>
- <if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
- ${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
- </if>
- <if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
- ${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
- </if>
- <if test="conditionParamRef.containsKey('createUserId')">
- <if test="conditionParamRef.createUserId != null ">
- ${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
- </if>
- <if test="conditionParamRef.createUserId == null">
- ${_conditionType_} a.createUserId is null
- </if>
+ <if test="conditionParamRef.containsKey('attendScoreSub')">
+ <if test="conditionParamRef.attendScoreSub != null ">
+ ${_conditionType_} a.attendScoreSub = #{${_conditionParam_}.attendScoreSub}
</if>
- <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
- ${_conditionType_} a.createUserId in
- <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('createUserIdNotList') and conditionParamRef.createUserIdNotList.size() > 0">
- ${_conditionType_} a.createUserId not in
- <foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
- ${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
- </if>
- <if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
- ${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
+ <if test="conditionParamRef.attendScoreSub == null">
+ ${_conditionType_} a.attendScoreSub is null
</if>
+ </if>
+ <if test="conditionParamRef.containsKey('attendScoreSubList') and conditionParamRef.attendScoreSubList.size() > 0">
+ ${_conditionType_} a.attendScoreSub in
+ <foreach collection="conditionParamRef.attendScoreSubList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('attendScoreSubNotList') and conditionParamRef.attendScoreSubNotList.size() > 0">
+ ${_conditionType_} a.attendScoreSub not in
+ <foreach collection="conditionParamRef.attendScoreSubNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('attendScoreSubStart') and conditionParamRef.attendScoreSubStart != null">
+ ${_conditionType_} a.attendScoreSub <![CDATA[ >= ]]> #{${_conditionParam_}.attendScoreSubStart}
+ </if>
+ <if test="conditionParamRef.containsKey('attendScoreSubEnd') and conditionParamRef.attendScoreSubEnd != null">
+ ${_conditionType_} a.attendScoreSub <![CDATA[ <= ]]> #{${_conditionParam_}.attendScoreSubEnd}
+ </if>
-
- <if test="conditionParamRef.containsKey('updateTime')">
- <if test="conditionParamRef.updateTime != null ">
- ${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
- </if>
- <if test="conditionParamRef.updateTime == null">
- ${_conditionType_} a.updateTime is null
- </if>
- </if>
- <if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
- ${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
- </if>
- <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
- ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
- </if>
- <if test="conditionParamRef.containsKey('updateUserId')">
- <if test="conditionParamRef.updateUserId != null ">
- ${_conditionType_} a.updateUserId = #{${_conditionParam_}.updateUserId}
- </if>
- <if test="conditionParamRef.updateUserId == null">
- ${_conditionType_} a.updateUserId is null
- </if>
- </if>
- <if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
- ${_conditionType_} a.updateUserId in
- <foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('updateUserIdNotList') and conditionParamRef.updateUserIdNotList.size() > 0">
- ${_conditionType_} a.updateUserId not in
- <foreach collection="conditionParamRef.updateUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
+ <if test="conditionParamRef.containsKey('assessScoreAdd')">
+ <if test="conditionParamRef.assessScoreAdd != null ">
+ ${_conditionType_} a.assessScoreAdd = #{${_conditionParam_}.assessScoreAdd}
</if>
- <if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null">
- ${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart}
- </if>
- <if test="conditionParamRef.containsKey('updateUserIdEnd') and conditionParamRef.updateUserIdEnd != null">
- ${_conditionType_} a.updateUserId <![CDATA[ <= ]]> #{${_conditionParam_}.updateUserIdEnd}
+ <if test="conditionParamRef.assessScoreAdd == null">
+ ${_conditionType_} a.assessScoreAdd is null
</if>
+ </if>
+ <if test="conditionParamRef.containsKey('assessScoreAddList') and conditionParamRef.assessScoreAddList.size() > 0">
+ ${_conditionType_} a.assessScoreAdd in
+ <foreach collection="conditionParamRef.assessScoreAddList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('assessScoreAddNotList') and conditionParamRef.assessScoreAddNotList.size() > 0">
+ ${_conditionType_} a.assessScoreAdd not in
+ <foreach collection="conditionParamRef.assessScoreAddNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('assessScoreAddStart') and conditionParamRef.assessScoreAddStart != null">
+ ${_conditionType_} a.assessScoreAdd <![CDATA[ >= ]]> #{${_conditionParam_}.assessScoreAddStart}
+ </if>
+ <if test="conditionParamRef.containsKey('assessScoreAddEnd') and conditionParamRef.assessScoreAddEnd != null">
+ ${_conditionType_} a.assessScoreAdd <![CDATA[ <= ]]> #{${_conditionParam_}.assessScoreAddEnd}
+ </if>
- <if test="conditionParamRef.containsKey('attendScoreAdd')">
- <if test="conditionParamRef.attendScoreAdd != null ">
- ${_conditionType_} a.attendScoreAdd = #{${_conditionParam_}.attendScoreAdd}
- </if>
- <if test="conditionParamRef.attendScoreAdd == null">
- ${_conditionType_} a.attendScoreAdd is null
- </if>
- </if>
- <if test="conditionParamRef.containsKey('attendScoreAddList') and conditionParamRef.attendScoreAddList.size() > 0">
- ${_conditionType_} a.attendScoreAdd in
- <foreach collection="conditionParamRef.attendScoreAddList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('attendScoreAddNotList') and conditionParamRef.attendScoreAddNotList.size() > 0">
- ${_conditionType_} a.attendScoreAdd not in
- <foreach collection="conditionParamRef.attendScoreAddNotList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
+ <if test="conditionParamRef.containsKey('assessScoreSub')">
+ <if test="conditionParamRef.assessScoreSub != null ">
+ ${_conditionType_} a.assessScoreSub = #{${_conditionParam_}.assessScoreSub}
</if>
- <if test="conditionParamRef.containsKey('attendScoreAddStart') and conditionParamRef.attendScoreAddStart != null">
- ${_conditionType_} a.attendScoreAdd <![CDATA[ >= ]]> #{${_conditionParam_}.attendScoreAddStart}
- </if>
- <if test="conditionParamRef.containsKey('attendScoreAddEnd') and conditionParamRef.attendScoreAddEnd != null">
- ${_conditionType_} a.attendScoreAdd <![CDATA[ <= ]]> #{${_conditionParam_}.attendScoreAddEnd}
+ <if test="conditionParamRef.assessScoreSub == null">
+ ${_conditionType_} a.assessScoreSub is null
</if>
+ </if>
+ <if test="conditionParamRef.containsKey('assessScoreSubList') and conditionParamRef.assessScoreSubList.size() > 0">
+ ${_conditionType_} a.assessScoreSub in
+ <foreach collection="conditionParamRef.assessScoreSubList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('assessScoreSubNotList') and conditionParamRef.assessScoreSubNotList.size() > 0">
+ ${_conditionType_} a.assessScoreSub not in
+ <foreach collection="conditionParamRef.assessScoreSubNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('assessScoreSubStart') and conditionParamRef.assessScoreSubStart != null">
+ ${_conditionType_} a.assessScoreSub <![CDATA[ >= ]]> #{${_conditionParam_}.assessScoreSubStart}
+ </if>
+ <if test="conditionParamRef.containsKey('assessScoreSubEnd') and conditionParamRef.assessScoreSubEnd != null">
+ ${_conditionType_} a.assessScoreSub <![CDATA[ <= ]]> #{${_conditionParam_}.assessScoreSubEnd}
+ </if>
- <if test="conditionParamRef.containsKey('attendScoreSub')">
- <if test="conditionParamRef.attendScoreSub != null ">
- ${_conditionType_} a.attendScoreSub = #{${_conditionParam_}.attendScoreSub}
- </if>
- <if test="conditionParamRef.attendScoreSub == null">
- ${_conditionType_} a.attendScoreSub is null
- </if>
+ <if test="conditionParamRef.containsKey('complainScoreAdd')">
+ <if test="conditionParamRef.complainScoreAdd != null ">
+ ${_conditionType_} a.complainScoreAdd = #{${_conditionParam_}.complainScoreAdd}
</if>
- <if test="conditionParamRef.containsKey('attendScoreSubList') and conditionParamRef.attendScoreSubList.size() > 0">
- ${_conditionType_} a.attendScoreSub in
- <foreach collection="conditionParamRef.attendScoreSubList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('attendScoreSubNotList') and conditionParamRef.attendScoreSubNotList.size() > 0">
- ${_conditionType_} a.attendScoreSub not in
- <foreach collection="conditionParamRef.attendScoreSubNotList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('attendScoreSubStart') and conditionParamRef.attendScoreSubStart != null">
- ${_conditionType_} a.attendScoreSub <![CDATA[ >= ]]> #{${_conditionParam_}.attendScoreSubStart}
- </if>
- <if test="conditionParamRef.containsKey('attendScoreSubEnd') and conditionParamRef.attendScoreSubEnd != null">
- ${_conditionType_} a.attendScoreSub <![CDATA[ <= ]]> #{${_conditionParam_}.attendScoreSubEnd}
+ <if test="conditionParamRef.complainScoreAdd == null">
+ ${_conditionType_} a.complainScoreAdd is null
</if>
+ </if>
+ <if test="conditionParamRef.containsKey('complainScoreAddList') and conditionParamRef.complainScoreAddList.size() > 0">
+ ${_conditionType_} a.complainScoreAdd in
+ <foreach collection="conditionParamRef.complainScoreAddList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('complainScoreAddNotList') and conditionParamRef.complainScoreAddNotList.size() > 0">
+ ${_conditionType_} a.complainScoreAdd not in
+ <foreach collection="conditionParamRef.complainScoreAddNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('complainScoreAddStart') and conditionParamRef.complainScoreAddStart != null">
+ ${_conditionType_} a.complainScoreAdd <![CDATA[ >= ]]> #{${_conditionParam_}.complainScoreAddStart}
+ </if>
+ <if test="conditionParamRef.containsKey('complainScoreAddEnd') and conditionParamRef.complainScoreAddEnd != null">
+ ${_conditionType_} a.complainScoreAdd <![CDATA[ <= ]]> #{${_conditionParam_}.complainScoreAddEnd}
+ </if>
- <if test="conditionParamRef.containsKey('assessScoreAdd')">
- <if test="conditionParamRef.assessScoreAdd != null ">
- ${_conditionType_} a.assessScoreAdd = #{${_conditionParam_}.assessScoreAdd}
- </if>
- <if test="conditionParamRef.assessScoreAdd == null">
- ${_conditionType_} a.assessScoreAdd is null
- </if>
+ <if test="conditionParamRef.containsKey('complainScoreSub')">
+ <if test="conditionParamRef.complainScoreSub != null ">
+ ${_conditionType_} a.complainScoreSub = #{${_conditionParam_}.complainScoreSub}
</if>
- <if test="conditionParamRef.containsKey('assessScoreAddList') and conditionParamRef.assessScoreAddList.size() > 0">
- ${_conditionType_} a.assessScoreAdd in
- <foreach collection="conditionParamRef.assessScoreAddList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('assessScoreAddNotList') and conditionParamRef.assessScoreAddNotList.size() > 0">
- ${_conditionType_} a.assessScoreAdd not in
- <foreach collection="conditionParamRef.assessScoreAddNotList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('assessScoreAddStart') and conditionParamRef.assessScoreAddStart != null">
- ${_conditionType_} a.assessScoreAdd <![CDATA[ >= ]]> #{${_conditionParam_}.assessScoreAddStart}
- </if>
- <if test="conditionParamRef.containsKey('assessScoreAddEnd') and conditionParamRef.assessScoreAddEnd != null">
- ${_conditionType_} a.assessScoreAdd <![CDATA[ <= ]]> #{${_conditionParam_}.assessScoreAddEnd}
+ <if test="conditionParamRef.complainScoreSub == null">
+ ${_conditionType_} a.complainScoreSub is null
</if>
+ </if>
+ <if test="conditionParamRef.containsKey('complainScoreSubList') and conditionParamRef.complainScoreSubList.size() > 0">
+ ${_conditionType_} a.complainScoreSub in
+ <foreach collection="conditionParamRef.complainScoreSubList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('complainScoreSubNotList') and conditionParamRef.complainScoreSubNotList.size() > 0">
+ ${_conditionType_} a.complainScoreSub not in
+ <foreach collection="conditionParamRef.complainScoreSubNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('complainScoreSubStart') and conditionParamRef.complainScoreSubStart != null">
+ ${_conditionType_} a.complainScoreSub <![CDATA[ >= ]]> #{${_conditionParam_}.complainScoreSubStart}
+ </if>
+ <if test="conditionParamRef.containsKey('complainScoreSubEnd') and conditionParamRef.complainScoreSubEnd != null">
+ ${_conditionType_} a.complainScoreSub <![CDATA[ <= ]]> #{${_conditionParam_}.complainScoreSubEnd}
+ </if>
- <if test="conditionParamRef.containsKey('assessScoreSub')">
- <if test="conditionParamRef.assessScoreSub != null ">
- ${_conditionType_} a.assessScoreSub = #{${_conditionParam_}.assessScoreSub}
- </if>
- <if test="conditionParamRef.assessScoreSub == null">
- ${_conditionType_} a.assessScoreSub is null
- </if>
- </if>
- <if test="conditionParamRef.containsKey('assessScoreSubList') and conditionParamRef.assessScoreSubList.size() > 0">
- ${_conditionType_} a.assessScoreSub in
- <foreach collection="conditionParamRef.assessScoreSubList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
+ <if test="conditionParamRef.containsKey('workScoreAdd')">
+ <if test="conditionParamRef.workScoreAdd != null ">
+ ${_conditionType_} a.workScoreAdd = #{${_conditionParam_}.workScoreAdd}
</if>
- <if test="conditionParamRef.containsKey('assessScoreSubNotList') and conditionParamRef.assessScoreSubNotList.size() > 0">
- ${_conditionType_} a.assessScoreSub not in
- <foreach collection="conditionParamRef.assessScoreSubNotList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('assessScoreSubStart') and conditionParamRef.assessScoreSubStart != null">
- ${_conditionType_} a.assessScoreSub <![CDATA[ >= ]]> #{${_conditionParam_}.assessScoreSubStart}
- </if>
- <if test="conditionParamRef.containsKey('assessScoreSubEnd') and conditionParamRef.assessScoreSubEnd != null">
- ${_conditionType_} a.assessScoreSub <![CDATA[ <= ]]> #{${_conditionParam_}.assessScoreSubEnd}
+ <if test="conditionParamRef.workScoreAdd == null">
+ ${_conditionType_} a.workScoreAdd is null
</if>
+ </if>
+ <if test="conditionParamRef.containsKey('workScoreAddList') and conditionParamRef.workScoreAddList.size() > 0">
+ ${_conditionType_} a.workScoreAdd in
+ <foreach collection="conditionParamRef.workScoreAddList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('workScoreAddNotList') and conditionParamRef.workScoreAddNotList.size() > 0">
+ ${_conditionType_} a.workScoreAdd not in
+ <foreach collection="conditionParamRef.workScoreAddNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('workScoreAddStart') and conditionParamRef.workScoreAddStart != null">
+ ${_conditionType_} a.workScoreAdd <![CDATA[ >= ]]> #{${_conditionParam_}.workScoreAddStart}
+ </if>
+ <if test="conditionParamRef.containsKey('workScoreAddEnd') and conditionParamRef.workScoreAddEnd != null">
+ ${_conditionType_} a.workScoreAdd <![CDATA[ <= ]]> #{${_conditionParam_}.workScoreAddEnd}
+ </if>
- <if test="conditionParamRef.containsKey('workScoreAdd')">
- <if test="conditionParamRef.workScoreAdd != null ">
- ${_conditionType_} a.workScoreAdd = #{${_conditionParam_}.workScoreAdd}
- </if>
- <if test="conditionParamRef.workScoreAdd == null">
- ${_conditionType_} a.workScoreAdd is null
- </if>
- </if>
- <if test="conditionParamRef.containsKey('workScoreAddList') and conditionParamRef.workScoreAddList.size() > 0">
- ${_conditionType_} a.workScoreAdd in
- <foreach collection="conditionParamRef.workScoreAddList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('workScoreAddNotList') and conditionParamRef.workScoreAddNotList.size() > 0">
- ${_conditionType_} a.workScoreAdd not in
- <foreach collection="conditionParamRef.workScoreAddNotList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('workScoreAddStart') and conditionParamRef.workScoreAddStart != null">
- ${_conditionType_} a.workScoreAdd <![CDATA[ >= ]]> #{${_conditionParam_}.workScoreAddStart}
+ <if test="conditionParamRef.containsKey('workScoreSub')">
+ <if test="conditionParamRef.workScoreSub != null ">
+ ${_conditionType_} a.workScoreSub = #{${_conditionParam_}.workScoreSub}
</if>
- <if test="conditionParamRef.containsKey('workScoreAddEnd') and conditionParamRef.workScoreAddEnd != null">
- ${_conditionType_} a.workScoreAdd <![CDATA[ <= ]]> #{${_conditionParam_}.workScoreAddEnd}
+ <if test="conditionParamRef.workScoreSub == null">
+ ${_conditionType_} a.workScoreSub is null
</if>
+ </if>
+ <if test="conditionParamRef.containsKey('workScoreSubList') and conditionParamRef.workScoreSubList.size() > 0">
+ ${_conditionType_} a.workScoreSub in
+ <foreach collection="conditionParamRef.workScoreSubList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('workScoreSubNotList') and conditionParamRef.workScoreSubNotList.size() > 0">
+ ${_conditionType_} a.workScoreSub not in
+ <foreach collection="conditionParamRef.workScoreSubNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('workScoreSubStart') and conditionParamRef.workScoreSubStart != null">
+ ${_conditionType_} a.workScoreSub <![CDATA[ >= ]]> #{${_conditionParam_}.workScoreSubStart}
+ </if>
+ <if test="conditionParamRef.containsKey('workScoreSubEnd') and conditionParamRef.workScoreSubEnd != null">
+ ${_conditionType_} a.workScoreSub <![CDATA[ <= ]]> #{${_conditionParam_}.workScoreSubEnd}
+ </if>
- <if test="conditionParamRef.containsKey('workScoreSub')">
- <if test="conditionParamRef.workScoreSub != null ">
- ${_conditionType_} a.workScoreSub = #{${_conditionParam_}.workScoreSub}
- </if>
- <if test="conditionParamRef.workScoreSub == null">
- ${_conditionType_} a.workScoreSub is null
- </if>
- </if>
- <if test="conditionParamRef.containsKey('workScoreSubList') and conditionParamRef.workScoreSubList.size() > 0">
- ${_conditionType_} a.workScoreSub in
- <foreach collection="conditionParamRef.workScoreSubList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('workScoreSubNotList') and conditionParamRef.workScoreSubNotList.size() > 0">
- ${_conditionType_} a.workScoreSub not in
- <foreach collection="conditionParamRef.workScoreSubNotList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
+ <if test="conditionParamRef.containsKey('effectScoreAdd')">
+ <if test="conditionParamRef.effectScoreAdd != null ">
+ ${_conditionType_} a.effectScoreAdd = #{${_conditionParam_}.effectScoreAdd}
</if>
- <if test="conditionParamRef.containsKey('workScoreSubStart') and conditionParamRef.workScoreSubStart != null">
- ${_conditionType_} a.workScoreSub <![CDATA[ >= ]]> #{${_conditionParam_}.workScoreSubStart}
- </if>
- <if test="conditionParamRef.containsKey('workScoreSubEnd') and conditionParamRef.workScoreSubEnd != null">
- ${_conditionType_} a.workScoreSub <![CDATA[ <= ]]> #{${_conditionParam_}.workScoreSubEnd}
+ <if test="conditionParamRef.effectScoreAdd == null">
+ ${_conditionType_} a.effectScoreAdd is null
</if>
+ </if>
+ <if test="conditionParamRef.containsKey('effectScoreAddList') and conditionParamRef.effectScoreAddList.size() > 0">
+ ${_conditionType_} a.effectScoreAdd in
+ <foreach collection="conditionParamRef.effectScoreAddList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('effectScoreAddNotList') and conditionParamRef.effectScoreAddNotList.size() > 0">
+ ${_conditionType_} a.effectScoreAdd not in
+ <foreach collection="conditionParamRef.effectScoreAddNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('effectScoreAddStart') and conditionParamRef.effectScoreAddStart != null">
+ ${_conditionType_} a.effectScoreAdd <![CDATA[ >= ]]> #{${_conditionParam_}.effectScoreAddStart}
+ </if>
+ <if test="conditionParamRef.containsKey('effectScoreAddEnd') and conditionParamRef.effectScoreAddEnd != null">
+ ${_conditionType_} a.effectScoreAdd <![CDATA[ <= ]]> #{${_conditionParam_}.effectScoreAddEnd}
+ </if>
- <if test="conditionParamRef.containsKey('effectScoreAdd')">
- <if test="conditionParamRef.effectScoreAdd != null ">
- ${_conditionType_} a.effectScoreAdd = #{${_conditionParam_}.effectScoreAdd}
- </if>
- <if test="conditionParamRef.effectScoreAdd == null">
- ${_conditionType_} a.effectScoreAdd is null
- </if>
+ <if test="conditionParamRef.containsKey('effectScoreSub')">
+ <if test="conditionParamRef.effectScoreSub != null ">
+ ${_conditionType_} a.effectScoreSub = #{${_conditionParam_}.effectScoreSub}
</if>
- <if test="conditionParamRef.containsKey('effectScoreAddList') and conditionParamRef.effectScoreAddList.size() > 0">
- ${_conditionType_} a.effectScoreAdd in
- <foreach collection="conditionParamRef.effectScoreAddList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('effectScoreAddNotList') and conditionParamRef.effectScoreAddNotList.size() > 0">
- ${_conditionType_} a.effectScoreAdd not in
- <foreach collection="conditionParamRef.effectScoreAddNotList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('effectScoreAddStart') and conditionParamRef.effectScoreAddStart != null">
- ${_conditionType_} a.effectScoreAdd <![CDATA[ >= ]]> #{${_conditionParam_}.effectScoreAddStart}
- </if>
- <if test="conditionParamRef.containsKey('effectScoreAddEnd') and conditionParamRef.effectScoreAddEnd != null">
- ${_conditionType_} a.effectScoreAdd <![CDATA[ <= ]]> #{${_conditionParam_}.effectScoreAddEnd}
+ <if test="conditionParamRef.effectScoreSub == null">
+ ${_conditionType_} a.effectScoreSub is null
</if>
+ </if>
+ <if test="conditionParamRef.containsKey('effectScoreSubList') and conditionParamRef.effectScoreSubList.size() > 0">
+ ${_conditionType_} a.effectScoreSub in
+ <foreach collection="conditionParamRef.effectScoreSubList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('effectScoreSubNotList') and conditionParamRef.effectScoreSubNotList.size() > 0">
+ ${_conditionType_} a.effectScoreSub not in
+ <foreach collection="conditionParamRef.effectScoreSubNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('effectScoreSubStart') and conditionParamRef.effectScoreSubStart != null">
+ ${_conditionType_} a.effectScoreSub <![CDATA[ >= ]]> #{${_conditionParam_}.effectScoreSubStart}
+ </if>
+ <if test="conditionParamRef.containsKey('effectScoreSubEnd') and conditionParamRef.effectScoreSubEnd != null">
+ ${_conditionType_} a.effectScoreSub <![CDATA[ <= ]]> #{${_conditionParam_}.effectScoreSubEnd}
+ </if>
- <if test="conditionParamRef.containsKey('effectScoreSub')">
- <if test="conditionParamRef.effectScoreSub != null ">
- ${_conditionType_} a.effectScoreSub = #{${_conditionParam_}.effectScoreSub}
- </if>
- <if test="conditionParamRef.effectScoreSub == null">
- ${_conditionType_} a.effectScoreSub is null
- </if>
- </if>
- <if test="conditionParamRef.containsKey('effectScoreSubList') and conditionParamRef.effectScoreSubList.size() > 0">
- ${_conditionType_} a.effectScoreSub in
- <foreach collection="conditionParamRef.effectScoreSubList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('effectScoreSubNotList') and conditionParamRef.effectScoreSubNotList.size() > 0">
- ${_conditionType_} a.effectScoreSub not in
- <foreach collection="conditionParamRef.effectScoreSubNotList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('effectScoreSubStart') and conditionParamRef.effectScoreSubStart != null">
- ${_conditionType_} a.effectScoreSub <![CDATA[ >= ]]> #{${_conditionParam_}.effectScoreSubStart}
+ <if test="conditionParamRef.containsKey('otherScoreAdd')">
+ <if test="conditionParamRef.otherScoreAdd != null ">
+ ${_conditionType_} a.otherScoreAdd = #{${_conditionParam_}.otherScoreAdd}
</if>
- <if test="conditionParamRef.containsKey('effectScoreSubEnd') and conditionParamRef.effectScoreSubEnd != null">
- ${_conditionType_} a.effectScoreSub <![CDATA[ <= ]]> #{${_conditionParam_}.effectScoreSubEnd}
+ <if test="conditionParamRef.otherScoreAdd == null">
+ ${_conditionType_} a.otherScoreAdd is null
</if>
+ </if>
+ <if test="conditionParamRef.containsKey('otherScoreAddList') and conditionParamRef.otherScoreAddList.size() > 0">
+ ${_conditionType_} a.otherScoreAdd in
+ <foreach collection="conditionParamRef.otherScoreAddList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('otherScoreAddNotList') and conditionParamRef.otherScoreAddNotList.size() > 0">
+ ${_conditionType_} a.otherScoreAdd not in
+ <foreach collection="conditionParamRef.otherScoreAddNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('otherScoreAddStart') and conditionParamRef.otherScoreAddStart != null">
+ ${_conditionType_} a.otherScoreAdd <![CDATA[ >= ]]> #{${_conditionParam_}.otherScoreAddStart}
+ </if>
+ <if test="conditionParamRef.containsKey('otherScoreAddEnd') and conditionParamRef.otherScoreAddEnd != null">
+ ${_conditionType_} a.otherScoreAdd <![CDATA[ <= ]]> #{${_conditionParam_}.otherScoreAddEnd}
+ </if>
- <if test="conditionParamRef.containsKey('otherScoreAdd')">
- <if test="conditionParamRef.otherScoreAdd != null ">
- ${_conditionType_} a.otherScoreAdd = #{${_conditionParam_}.otherScoreAdd}
- </if>
- <if test="conditionParamRef.otherScoreAdd == null">
- ${_conditionType_} a.otherScoreAdd is null
- </if>
+ <if test="conditionParamRef.containsKey('otherScoreSub')">
+ <if test="conditionParamRef.otherScoreSub != null ">
+ ${_conditionType_} a.otherScoreSub = #{${_conditionParam_}.otherScoreSub}
</if>
- <if test="conditionParamRef.containsKey('otherScoreAddList') and conditionParamRef.otherScoreAddList.size() > 0">
- ${_conditionType_} a.otherScoreAdd in
- <foreach collection="conditionParamRef.otherScoreAddList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('otherScoreAddNotList') and conditionParamRef.otherScoreAddNotList.size() > 0">
- ${_conditionType_} a.otherScoreAdd not in
- <foreach collection="conditionParamRef.otherScoreAddNotList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('otherScoreAddStart') and conditionParamRef.otherScoreAddStart != null">
- ${_conditionType_} a.otherScoreAdd <![CDATA[ >= ]]> #{${_conditionParam_}.otherScoreAddStart}
- </if>
- <if test="conditionParamRef.containsKey('otherScoreAddEnd') and conditionParamRef.otherScoreAddEnd != null">
- ${_conditionType_} a.otherScoreAdd <![CDATA[ <= ]]> #{${_conditionParam_}.otherScoreAddEnd}
+ <if test="conditionParamRef.otherScoreSub == null">
+ ${_conditionType_} a.otherScoreSub is null
</if>
+ </if>
+ <if test="conditionParamRef.containsKey('otherScoreSubList') and conditionParamRef.otherScoreSubList.size() > 0">
+ ${_conditionType_} a.otherScoreSub in
+ <foreach collection="conditionParamRef.otherScoreSubList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('otherScoreSubNotList') and conditionParamRef.otherScoreSubNotList.size() > 0">
+ ${_conditionType_} a.otherScoreSub not in
+ <foreach collection="conditionParamRef.otherScoreSubNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('otherScoreSubStart') and conditionParamRef.otherScoreSubStart != null">
+ ${_conditionType_} a.otherScoreSub <![CDATA[ >= ]]> #{${_conditionParam_}.otherScoreSubStart}
+ </if>
+ <if test="conditionParamRef.containsKey('otherScoreSubEnd') and conditionParamRef.otherScoreSubEnd != null">
+ ${_conditionType_} a.otherScoreSub <![CDATA[ <= ]]> #{${_conditionParam_}.otherScoreSubEnd}
+ </if>
- <if test="conditionParamRef.containsKey('otherScoreSub')">
- <if test="conditionParamRef.otherScoreSub != null ">
- ${_conditionType_} a.otherScoreSub = #{${_conditionParam_}.otherScoreSub}
- </if>
- <if test="conditionParamRef.otherScoreSub == null">
- ${_conditionType_} a.otherScoreSub is null
- </if>
- </if>
- <if test="conditionParamRef.containsKey('otherScoreSubList') and conditionParamRef.otherScoreSubList.size() > 0">
- ${_conditionType_} a.otherScoreSub in
- <foreach collection="conditionParamRef.otherScoreSubList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('otherScoreSubNotList') and conditionParamRef.otherScoreSubNotList.size() > 0">
- ${_conditionType_} a.otherScoreSub not in
- <foreach collection="conditionParamRef.otherScoreSubNotList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('otherScoreSubStart') and conditionParamRef.otherScoreSubStart != null">
- ${_conditionType_} a.otherScoreSub <![CDATA[ >= ]]> #{${_conditionParam_}.otherScoreSubStart}
- </if>
- <if test="conditionParamRef.containsKey('otherScoreSubEnd') and conditionParamRef.otherScoreSubEnd != null">
- ${_conditionType_} a.otherScoreSub <![CDATA[ <= ]]> #{${_conditionParam_}.otherScoreSubEnd}
- </if>
- <if test="conditionParamRef.containsKey('day')">
- <if test="conditionParamRef.day != null ">
- ${_conditionType_} a.day = #{${_conditionParam_}.day}
- </if>
- <if test="conditionParamRef.day == null">
- ${_conditionType_} a.day is null
- </if>
- </if>
- <if test="conditionParamRef.containsKey('dayList') and conditionParamRef.dayList.size() > 0">
- ${_conditionType_} a.day in
- <foreach collection="conditionParamRef.dayList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
+ <if test="conditionParamRef.containsKey('remark')">
+ <if test="conditionParamRef.remark != null and conditionParamRef.remark != ''">
+ ${_conditionType_} a.remark like #{${_conditionParam_}.remark}
</if>
- <if test="conditionParamRef.containsKey('dayNotList') and conditionParamRef.dayNotList.size() > 0">
- ${_conditionType_} a.day not in
- <foreach collection="conditionParamRef.dayNotList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
+ <if test="conditionParamRef.remark == null">
+ ${_conditionType_} a.remark is null
</if>
- <if test="conditionParamRef.containsKey('dayStart') and conditionParamRef.dayStart != null">
- ${_conditionType_} a.day <![CDATA[ >= ]]> #{${_conditionParam_}.dayStart}
+ </if>
+ <if test="conditionParamRef.containsKey('remarkList') and conditionParamRef.remarkList.size() > 0">
+ ${_conditionType_} a.remark in
+ <foreach collection="conditionParamRef.remarkList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('remarkNotList') and conditionParamRef.remarkNotList.size() > 0">
+ ${_conditionType_} a.remark not in
+ <foreach collection="conditionParamRef.remarkNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('year')">
+ <if test="conditionParamRef.year != null ">
+ ${_conditionType_} a.year = #{${_conditionParam_}.year}
</if>
- <if test="conditionParamRef.containsKey('dayEnd') and conditionParamRef.dayEnd != null">
- ${_conditionType_} a.day <![CDATA[ <= ]]> #{${_conditionParam_}.dayEnd}
+ <if test="conditionParamRef.year == null">
+ ${_conditionType_} a.year is null
</if>
+ </if>
+ <if test="conditionParamRef.containsKey('yearList') and conditionParamRef.yearList.size() > 0">
+ ${_conditionType_} a.year in
+ <foreach collection="conditionParamRef.yearList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('yearNotList') and conditionParamRef.yearNotList.size() > 0">
+ ${_conditionType_} a.year not in
+ <foreach collection="conditionParamRef.yearNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('yearStart') and conditionParamRef.yearStart != null">
+ ${_conditionType_} a.year <![CDATA[ >= ]]> #{${_conditionParam_}.yearStart}
+ </if>
+ <if test="conditionParamRef.containsKey('yearEnd') and conditionParamRef.yearEnd != null">
+ ${_conditionType_} a.year <![CDATA[ <= ]]> #{${_conditionParam_}.yearEnd}
+ </if>
- <if test="conditionParamRef.containsKey('totalAddScore')">
- <if test="conditionParamRef.totalAddScore != null ">
- ${_conditionType_} a.totalAddScore = #{${_conditionParam_}.totalAddScore}
- </if>
- <if test="conditionParamRef.totalAddScore == null">
- ${_conditionType_} a.totalAddScore is null
- </if>
+ <if test="conditionParamRef.containsKey('month')">
+ <if test="conditionParamRef.month != null ">
+ ${_conditionType_} a.month = #{${_conditionParam_}.month}
</if>
- <if test="conditionParamRef.containsKey('totalAddScoreList') and conditionParamRef.totalAddScoreList.size() > 0">
- ${_conditionType_} a.totalAddScore in
- <foreach collection="conditionParamRef.totalAddScoreList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('totalAddScoreNotList') and conditionParamRef.totalAddScoreNotList.size() > 0">
- ${_conditionType_} a.totalAddScore not in
- <foreach collection="conditionParamRef.totalAddScoreNotList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('totalAddScoreStart') and conditionParamRef.totalAddScoreStart != null">
- ${_conditionType_} a.totalAddScore <![CDATA[ >= ]]> #{${_conditionParam_}.totalAddScoreStart}
- </if>
- <if test="conditionParamRef.containsKey('totalAddScoreEnd') and conditionParamRef.totalAddScoreEnd != null">
- ${_conditionType_} a.totalAddScore <![CDATA[ <= ]]> #{${_conditionParam_}.totalAddScoreEnd}
+ <if test="conditionParamRef.month == null">
+ ${_conditionType_} a.month is null
</if>
+ </if>
+ <if test="conditionParamRef.containsKey('monthList') and conditionParamRef.monthList.size() > 0">
+ ${_conditionType_} a.month in
+ <foreach collection="conditionParamRef.monthList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('monthNotList') and conditionParamRef.monthNotList.size() > 0">
+ ${_conditionType_} a.month not in
+ <foreach collection="conditionParamRef.monthNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('monthStart') and conditionParamRef.monthStart != null">
+ ${_conditionType_} a.month <![CDATA[ >= ]]> #{${_conditionParam_}.monthStart}
+ </if>
+ <if test="conditionParamRef.containsKey('monthEnd') and conditionParamRef.monthEnd != null">
+ ${_conditionType_} a.month <![CDATA[ <= ]]> #{${_conditionParam_}.monthEnd}
+ </if>
- <if test="conditionParamRef.containsKey('totalSubScore')">
- <if test="conditionParamRef.totalSubScore != null ">
- ${_conditionType_} a.totalSubScore = #{${_conditionParam_}.totalSubScore}
- </if>
- <if test="conditionParamRef.totalSubScore == null">
- ${_conditionType_} a.totalSubScore is null
- </if>
+ <if test="conditionParamRef.containsKey('day')">
+ <if test="conditionParamRef.day != null ">
+ ${_conditionType_} a.day = #{${_conditionParam_}.day}
</if>
- <if test="conditionParamRef.containsKey('totalSubScoreList') and conditionParamRef.totalSubScoreList.size() > 0">
- ${_conditionType_} a.totalSubScore in
- <foreach collection="conditionParamRef.totalSubScoreList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('totalSubScoreNotList') and conditionParamRef.totalSubScoreNotList.size() > 0">
- ${_conditionType_} a.totalSubScore not in
- <foreach collection="conditionParamRef.totalSubScoreNotList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('totalSubScoreStart') and conditionParamRef.totalSubScoreStart != null">
- ${_conditionType_} a.totalSubScore <![CDATA[ >= ]]> #{${_conditionParam_}.totalSubScoreStart}
- </if>
- <if test="conditionParamRef.containsKey('totalSubScoreEnd') and conditionParamRef.totalSubScoreEnd != null">
- ${_conditionType_} a.totalSubScore <![CDATA[ <= ]]> #{${_conditionParam_}.totalSubScoreEnd}
+ <if test="conditionParamRef.day == null">
+ ${_conditionType_} a.day is null
</if>
+ </if>
+ <if test="conditionParamRef.containsKey('dayList') and conditionParamRef.dayList.size() > 0">
+ ${_conditionType_} a.day in
+ <foreach collection="conditionParamRef.dayList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('dayNotList') and conditionParamRef.dayNotList.size() > 0">
+ ${_conditionType_} a.day not in
+ <foreach collection="conditionParamRef.dayNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('dayStart') and conditionParamRef.dayStart != null">
+ ${_conditionType_} a.day <![CDATA[ >= ]]> #{${_conditionParam_}.dayStart}
+ </if>
+ <if test="conditionParamRef.containsKey('dayEnd') and conditionParamRef.dayEnd != null">
+ ${_conditionType_} a.day <![CDATA[ <= ]]> #{${_conditionParam_}.dayEnd}
+ </if>
- <if test="conditionParamRef.containsKey('complainScoreAdd')">
- <if test="conditionParamRef.complainScoreAdd != null ">
- ${_conditionType_} a.complainScoreAdd = #{${_conditionParam_}.complainScoreAdd}
- </if>
- <if test="conditionParamRef.complainScoreAdd == null">
- ${_conditionType_} a.complainScoreAdd is null
- </if>
- </if>
- <if test="conditionParamRef.containsKey('complainScoreAddList') and conditionParamRef.complainScoreAddList.size() > 0">
- ${_conditionType_} a.complainScoreAdd in
- <foreach collection="conditionParamRef.complainScoreAddList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
+
+ <if test="conditionParamRef.containsKey('createTime')">
+ <if test="conditionParamRef.createTime != null ">
+ ${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
</if>
- <if test="conditionParamRef.containsKey('complainScoreAddNotList') and conditionParamRef.complainScoreAddNotList.size() > 0">
- ${_conditionType_} a.complainScoreAdd not in
- <foreach collection="conditionParamRef.complainScoreAddNotList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
+ <if test="conditionParamRef.createTime == null">
+ ${_conditionType_} a.createTime is null
</if>
- <if test="conditionParamRef.containsKey('complainScoreAddStart') and conditionParamRef.complainScoreAddStart != null">
- ${_conditionType_} a.complainScoreAdd <![CDATA[ >= ]]> #{${_conditionParam_}.complainScoreAddStart}
+ </if>
+ <if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
+ ${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+ </if>
+ <if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
+ ${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+ </if>
+ <if test="conditionParamRef.containsKey('createUserId')">
+ <if test="conditionParamRef.createUserId != null ">
+ ${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
</if>
- <if test="conditionParamRef.containsKey('complainScoreAddEnd') and conditionParamRef.complainScoreAddEnd != null">
- ${_conditionType_} a.complainScoreAdd <![CDATA[ <= ]]> #{${_conditionParam_}.complainScoreAddEnd}
+ <if test="conditionParamRef.createUserId == null">
+ ${_conditionType_} a.createUserId is null
</if>
+ </if>
+ <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
+ ${_conditionType_} a.createUserId in
+ <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('createUserIdNotList') and conditionParamRef.createUserIdNotList.size() > 0">
+ ${_conditionType_} a.createUserId not in
+ <foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
+ ${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
+ </if>
+ <if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
+ ${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
+ </if>
- <if test="conditionParamRef.containsKey('complainScoreSub')">
- <if test="conditionParamRef.complainScoreSub != null ">
- ${_conditionType_} a.complainScoreSub = #{${_conditionParam_}.complainScoreSub}
- </if>
- <if test="conditionParamRef.complainScoreSub == null">
- ${_conditionType_} a.complainScoreSub is null
- </if>
- </if>
- <if test="conditionParamRef.containsKey('complainScoreSubList') and conditionParamRef.complainScoreSubList.size() > 0">
- ${_conditionType_} a.complainScoreSub in
- <foreach collection="conditionParamRef.complainScoreSubList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
+
+ <if test="conditionParamRef.containsKey('updateTime')">
+ <if test="conditionParamRef.updateTime != null ">
+ ${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
</if>
- <if test="conditionParamRef.containsKey('complainScoreSubNotList') and conditionParamRef.complainScoreSubNotList.size() > 0">
- ${_conditionType_} a.complainScoreSub not in
- <foreach collection="conditionParamRef.complainScoreSubNotList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
+ <if test="conditionParamRef.updateTime == null">
+ ${_conditionType_} a.updateTime is null
</if>
- <if test="conditionParamRef.containsKey('complainScoreSubStart') and conditionParamRef.complainScoreSubStart != null">
- ${_conditionType_} a.complainScoreSub <![CDATA[ >= ]]> #{${_conditionParam_}.complainScoreSubStart}
+ </if>
+ <if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
+ ${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+ </if>
+ <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
+ ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+ </if>
+ <if test="conditionParamRef.containsKey('updateUserId')">
+ <if test="conditionParamRef.updateUserId != null ">
+ ${_conditionType_} a.updateUserId = #{${_conditionParam_}.updateUserId}
</if>
- <if test="conditionParamRef.containsKey('complainScoreSubEnd') and conditionParamRef.complainScoreSubEnd != null">
- ${_conditionType_} a.complainScoreSub <![CDATA[ <= ]]> #{${_conditionParam_}.complainScoreSubEnd}
+ <if test="conditionParamRef.updateUserId == null">
+ ${_conditionType_} a.updateUserId is null
</if>
+ </if>
+ <if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
+ ${_conditionType_} a.updateUserId in
+ <foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('updateUserIdNotList') and conditionParamRef.updateUserIdNotList.size() > 0">
+ ${_conditionType_} a.updateUserId not in
+ <foreach collection="conditionParamRef.updateUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null">
+ ${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart}
+ </if>
+ <if test="conditionParamRef.containsKey('updateUserIdEnd') and conditionParamRef.updateUserIdEnd != null">
+ ${_conditionType_} a.updateUserId <![CDATA[ <= ]]> #{${_conditionParam_}.updateUserIdEnd}
+ </if>
</sql>
<sql id="_orderCols_">
@@ -1360,143 +1360,143 @@
order by
<trim suffixOverrides="," suffix="">
<foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
- ${item.colName} ${item.sortKind}
+ ${item.colName} ${item.sortKind}
</foreach>
</trim>
</if>
<if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
order by
<trim suffixOverrides="," suffix="">
- <if test="orderCol.containsKey('id')">
- a.id
- <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('deptId')">
- a.deptId
- <if test='orderCol.deptId != null and "DESC".equalsIgnoreCase(orderCol.deptId)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('deptName')">
- a.deptName
- <if test='orderCol.deptName != null and "DESC".equalsIgnoreCase(orderCol.deptName)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('totalScore')">
- a.totalScore
- <if test='orderCol.totalScore != null and "DESC".equalsIgnoreCase(orderCol.totalScore)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('remark')">
- a.remark
- <if test='orderCol.remark != null and "DESC".equalsIgnoreCase(orderCol.remark)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('year')">
- a.year
- <if test='orderCol.year != null and "DESC".equalsIgnoreCase(orderCol.year)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('month')">
- a.month
- <if test='orderCol.month != null and "DESC".equalsIgnoreCase(orderCol.month)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('createTime')">
- a.createTime
- <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('createUserId')">
- a.createUserId
- <if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('updateTime')">
- a.updateTime
- <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('updateUserId')">
- a.updateUserId
- <if test='orderCol.updateUserId != null and "DESC".equalsIgnoreCase(orderCol.updateUserId)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('attendScoreAdd')">
- a.attendScoreAdd
- <if test='orderCol.attendScoreAdd != null and "DESC".equalsIgnoreCase(orderCol.attendScoreAdd)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('attendScoreSub')">
- a.attendScoreSub
- <if test='orderCol.attendScoreSub != null and "DESC".equalsIgnoreCase(orderCol.attendScoreSub)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('assessScoreAdd')">
- a.assessScoreAdd
- <if test='orderCol.assessScoreAdd != null and "DESC".equalsIgnoreCase(orderCol.assessScoreAdd)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('assessScoreSub')">
- a.assessScoreSub
- <if test='orderCol.assessScoreSub != null and "DESC".equalsIgnoreCase(orderCol.assessScoreSub)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('workScoreAdd')">
- a.workScoreAdd
- <if test='orderCol.workScoreAdd != null and "DESC".equalsIgnoreCase(orderCol.workScoreAdd)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('workScoreSub')">
- a.workScoreSub
- <if test='orderCol.workScoreSub != null and "DESC".equalsIgnoreCase(orderCol.workScoreSub)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('effectScoreAdd')">
- a.effectScoreAdd
- <if test='orderCol.effectScoreAdd != null and "DESC".equalsIgnoreCase(orderCol.effectScoreAdd)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('effectScoreSub')">
- a.effectScoreSub
- <if test='orderCol.effectScoreSub != null and "DESC".equalsIgnoreCase(orderCol.effectScoreSub)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('otherScoreAdd')">
- a.otherScoreAdd
- <if test='orderCol.otherScoreAdd != null and "DESC".equalsIgnoreCase(orderCol.otherScoreAdd)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('otherScoreSub')">
- a.otherScoreSub
- <if test='orderCol.otherScoreSub != null and "DESC".equalsIgnoreCase(orderCol.otherScoreSub)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('day')">
- a.day
- <if test='orderCol.day != null and "DESC".equalsIgnoreCase(orderCol.day)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('totalAddScore')">
- a.totalAddScore
- <if test='orderCol.totalAddScore != null and "DESC".equalsIgnoreCase(orderCol.totalAddScore)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('totalSubScore')">
- a.totalSubScore
- <if test='orderCol.totalSubScore != null and "DESC".equalsIgnoreCase(orderCol.totalSubScore)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('complainScoreAdd')">
- a.complainScoreAdd
- <if test='orderCol.complainScoreAdd != null and "DESC".equalsIgnoreCase(orderCol.complainScoreAdd)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('complainScoreSub')">
- a.complainScoreSub
- <if test='orderCol.complainScoreSub != null and "DESC".equalsIgnoreCase(orderCol.complainScoreSub)'>DESC</if>
- ,
- </if>
+ <if test="orderCol.containsKey('id')">
+ a.id
+ <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('staffId')">
+ a.staffId
+ <if test='orderCol.staffId != null and "DESC".equalsIgnoreCase(orderCol.staffId)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('staffName')">
+ a.staffName
+ <if test='orderCol.staffName != null and "DESC".equalsIgnoreCase(orderCol.staffName)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('totalScore')">
+ a.totalScore
+ <if test='orderCol.totalScore != null and "DESC".equalsIgnoreCase(orderCol.totalScore)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('totalAddScore')">
+ a.totalAddScore
+ <if test='orderCol.totalAddScore != null and "DESC".equalsIgnoreCase(orderCol.totalAddScore)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('totalSubScore')">
+ a.totalSubScore
+ <if test='orderCol.totalSubScore != null and "DESC".equalsIgnoreCase(orderCol.totalSubScore)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('attendScoreAdd')">
+ a.attendScoreAdd
+ <if test='orderCol.attendScoreAdd != null and "DESC".equalsIgnoreCase(orderCol.attendScoreAdd)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('attendScoreSub')">
+ a.attendScoreSub
+ <if test='orderCol.attendScoreSub != null and "DESC".equalsIgnoreCase(orderCol.attendScoreSub)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('assessScoreAdd')">
+ a.assessScoreAdd
+ <if test='orderCol.assessScoreAdd != null and "DESC".equalsIgnoreCase(orderCol.assessScoreAdd)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('assessScoreSub')">
+ a.assessScoreSub
+ <if test='orderCol.assessScoreSub != null and "DESC".equalsIgnoreCase(orderCol.assessScoreSub)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('complainScoreAdd')">
+ a.complainScoreAdd
+ <if test='orderCol.complainScoreAdd != null and "DESC".equalsIgnoreCase(orderCol.complainScoreAdd)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('complainScoreSub')">
+ a.complainScoreSub
+ <if test='orderCol.complainScoreSub != null and "DESC".equalsIgnoreCase(orderCol.complainScoreSub)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('workScoreAdd')">
+ a.workScoreAdd
+ <if test='orderCol.workScoreAdd != null and "DESC".equalsIgnoreCase(orderCol.workScoreAdd)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('workScoreSub')">
+ a.workScoreSub
+ <if test='orderCol.workScoreSub != null and "DESC".equalsIgnoreCase(orderCol.workScoreSub)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('effectScoreAdd')">
+ a.effectScoreAdd
+ <if test='orderCol.effectScoreAdd != null and "DESC".equalsIgnoreCase(orderCol.effectScoreAdd)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('effectScoreSub')">
+ a.effectScoreSub
+ <if test='orderCol.effectScoreSub != null and "DESC".equalsIgnoreCase(orderCol.effectScoreSub)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('otherScoreAdd')">
+ a.otherScoreAdd
+ <if test='orderCol.otherScoreAdd != null and "DESC".equalsIgnoreCase(orderCol.otherScoreAdd)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('otherScoreSub')">
+ a.otherScoreSub
+ <if test='orderCol.otherScoreSub != null and "DESC".equalsIgnoreCase(orderCol.otherScoreSub)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('remark')">
+ a.remark
+ <if test='orderCol.remark != null and "DESC".equalsIgnoreCase(orderCol.remark)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('year')">
+ a.year
+ <if test='orderCol.year != null and "DESC".equalsIgnoreCase(orderCol.year)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('month')">
+ a.month
+ <if test='orderCol.month != null and "DESC".equalsIgnoreCase(orderCol.month)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('day')">
+ a.day
+ <if test='orderCol.day != null and "DESC".equalsIgnoreCase(orderCol.day)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('createTime')">
+ a.createTime
+ <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('createUserId')">
+ a.createUserId
+ <if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('updateTime')">
+ a.updateTime
+ <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('updateUserId')">
+ a.updateUserId
+ <if test='orderCol.updateUserId != null and "DESC".equalsIgnoreCase(orderCol.updateUserId)'>DESC</if>
+ ,
+ </if>
</trim>
</if>
</sql>
diff --git a/db/add.sql b/db/add.sql
index ebd778c175af05feabc22addb07a6de981fde255..b1da7ec0b02026241d2628c8e27ca052c184042f 100644
--- a/db/add.sql
+++ b/db/add.sql
@@ -503,3 +503,40 @@ CREATE TABLE mortals_xhx_window_owner_detail(
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='绐楀彛璐熻矗浜鸿缁�';
+
+
+-- ----------------------------
+-- 鍛樺伐缁╂晥缁熻琛�
+-- ----------------------------
+DROP TABLE IF EXISTS `mortals_xhx_staff_perform_stat`;
+CREATE TABLE mortals_xhx_staff_perform_stat(
+ `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '涓婚敭ID锛屼富閿紝鑷闀�',
+ `staffId` bigint(20) DEFAULT '0' COMMENT '閮ㄩ棬id鍙�',
+ `staffName` varchar(64) COMMENT '閮ㄩ棬鍚嶇О',
+ `totalScore` decimal(10,2) NOT NULL COMMENT '鍛樺伐缁╂晥鎬诲垎鏁�',
+ `totalAddScore` decimal(10,2) NOT NULL COMMENT '鍛樺伐缁╂晥鍔犲垎鎬诲垎鏁版眹鎬�',
+ `totalSubScore` decimal(10,2) NOT NULL COMMENT '鍛樺伐缁╂晥鍑忓垎鎬诲垎鏁版眹鎬�',
+ `attendScoreAdd` decimal(10,2) COMMENT '鑰冨嫟缁╂晥鎸囨爣澧炲姞鍒嗘暟',
+ `attendScoreSub` decimal(10,2) COMMENT '鑰冨嫟缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟',
+ `assessScoreAdd` decimal(10,2) COMMENT '璇勪环缁╂晥鎸囨爣澧炲姞鍒嗘暟',
+ `assessScoreSub` decimal(10,2) COMMENT '璇勪环缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟',
+ `complainScoreAdd` decimal(10,2) COMMENT '鎶曡瘔缁╂晥鎸囨爣澧炲姞鍒嗘暟',
+ `complainScoreSub` decimal(10,2) COMMENT '鎶曡瘔缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟',
+ `workScoreAdd` decimal(10,2) COMMENT '鍔炰欢缁╂晥鎸囨爣澧炲姞鍒嗘暟',
+ `workScoreSub` decimal(10,2) COMMENT '鍔炰欢缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟',
+ `effectScoreAdd` decimal(10,2) COMMENT '鏁堣兘缁╂晥鎸囨爣澧炲姞鍒嗘暟',
+ `effectScoreSub` decimal(10,2) COMMENT '鏁堣兘缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟',
+ `otherScoreAdd` decimal(10,2) COMMENT '鍏跺畠缁╂晥鎸囨爣澧炲姞鍒嗘暟',
+ `otherScoreSub` decimal(10,2) COMMENT '鍏跺畠缁╂晥鎸囨爣鎵ｅ噺鍒嗘暟',
+ `remark` varchar(255) COMMENT '澶囨敞',
+ `year` int(9) NOT NULL COMMENT '骞�',
+ `month` tinyint(2) NOT NULL COMMENT '鏈�',
+ `day` tinyint(2) NOT NULL COMMENT '鏃�',
+ `createTime` datetime COMMENT '鍒涘缓鏃堕棿',
+ `createUserId` bigint(20) COMMENT '鍒涘缓浜篿d',
+ `updateTime` datetime COMMENT '鏇存柊鏃堕棿',
+ `updateUserId` bigint(20) COMMENT '鏇存柊浜篿d',
+PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='鍛樺伐缁╂晥缁熻';
+
+
diff --git "a/doc/\350\200\203\345\213\244\347\273\251\346\225\210\347\256\241\347\220\206\347\263\273\347\273\237.docx" "b/doc/\350\200\203\345\213\244\347\273\251\346\225\210\347\256\241\347\220\206\347\263\273\347\273\237.docx"
index d07cd5134df3f6bbc1450af023fffa46db3cc12b..378276d3352dd7d6b278ea3da5062df3567e7fd3 100644
Binary files "a/doc/\350\200\203\345\213\244\347\273\251\346\225\210\347\256\241\347\220\206\347\263\273\347\273\237.docx" and "b/doc/\350\200\203\345\213\244\347\273\251\346\225\210\347\256\241\347\220\206\347\263\273\347\273\237.docx" differ