潘钊 / bsth_control · Commits

Commit d5a1fab9d9b5a5ccb790fb153954bb0d3f574ad8

Authored by 徐烜
1 parent 9ac809ab
build: skipped

1、修改人员基础信息修改添加功能，添加停用字段设置，修正工号验证逻辑，修改人员信息导入逻辑

Inline Side-by-side
Showing 6 changed files with 299 additions and 21 deletions
src/main/java/com/bsth/service/schedule/impl/EmployeeServiceImpl.java
  View file @d5a1fab
... ... @@ -55,6 +55,7 @@ public class EmployeeServiceImpl extends BServiceImpl<Personnel, Integer> implem
55 55 }
56 56 param.put("companyCode_eq", personnel.getCompanyCode());
57 57 param.put("jobCode_eq", personnel.getJobCode());
  58 + param.put("destroy_eq", 0);
58 59 if (!CollectionUtils.isEmpty(list(param))) {
59 60 throw new ScheduleException("相同公司工号重复");
60 61 }
... ...
src/main/resources/datatools/ktrs/employeesDataInput.ktr
  View file @d5a1fab
... ... @@ -241,6 +241,30 @@
241 241 </attributes>
242 242 </connection>
243 243 <connection>
  244 + <name>lgjw_oracle_jndi</name>
  245 + <server/>
  246 + <type>ORACLE</type>
  247 + <access>JNDI</access>
  248 + <database>lgjw_oracle</database>
  249 + <port>1521</port>
  250 + <username/>
  251 + <password>Encrypted </password>
  252 + <servername/>
  253 + <data_tablespace>LGJW</data_tablespace>
  254 + <index_tablespace/>
  255 + <attributes>
  256 + <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute>
  257 + <attribute><code>FORCE_IDENTIFIERS_TO_UPPERCASE</code><attribute>N</attribute></attribute>
  258 + <attribute><code>IS_CLUSTERED</code><attribute>N</attribute></attribute>
  259 + <attribute><code>PORT_NUMBER</code><attribute>1521</attribute></attribute>
  260 + <attribute><code>PRESERVE_RESERVED_WORD_CASE</code><attribute>N</attribute></attribute>
  261 + <attribute><code>QUOTE_ALL_FIELDS</code><attribute>N</attribute></attribute>
  262 + <attribute><code>SUPPORTS_BOOLEAN_DATA_TYPE</code><attribute>Y</attribute></attribute>
  263 + <attribute><code>SUPPORTS_TIMESTAMP_DATA_TYPE</code><attribute>Y</attribute></attribute>
  264 + <attribute><code>USE_POOLING</code><attribute>N</attribute></attribute>
  265 + </attributes>
  266 + </connection>
  267 + <connection>
244 268 <name>NHJW_VM</name>
245 269 <server>192.168.198.240</server>
246 270 <type>ORACLE</type>
... ... @@ -391,6 +415,33 @@
391 415 </attributes>
392 416 </connection>
393 417 <connection>
  418 + <name>test_control_local</name>
  419 + <server>localhost</server>
  420 + <type>MYSQL</type>
  421 + <access>Native</access>
  422 + <database>test_control</database>
  423 + <port>3306</port>
  424 + <username>root</username>
  425 + <password>Encrypted </password>
  426 + <servername/>
  427 + <data_tablespace/>
  428 + <index_tablespace/>
  429 + <attributes>
  430 + <attribute><code>EXTRA_OPTION_MYSQL.defaultFetchSize</code><attribute>500</attribute></attribute>
  431 + <attribute><code>EXTRA_OPTION_MYSQL.useCursorFetch</code><attribute>true</attribute></attribute>
  432 + <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute>
  433 + <attribute><code>FORCE_IDENTIFIERS_TO_UPPERCASE</code><attribute>N</attribute></attribute>
  434 + <attribute><code>IS_CLUSTERED</code><attribute>N</attribute></attribute>
  435 + <attribute><code>PORT_NUMBER</code><attribute>3306</attribute></attribute>
  436 + <attribute><code>PRESERVE_RESERVED_WORD_CASE</code><attribute>N</attribute></attribute>
  437 + <attribute><code>QUOTE_ALL_FIELDS</code><attribute>N</attribute></attribute>
  438 + <attribute><code>STREAM_RESULTS</code><attribute>Y</attribute></attribute>
  439 + <attribute><code>SUPPORTS_BOOLEAN_DATA_TYPE</code><attribute>Y</attribute></attribute>
  440 + <attribute><code>SUPPORTS_TIMESTAMP_DATA_TYPE</code><attribute>Y</attribute></attribute>
  441 + <attribute><code>USE_POOLING</code><attribute>N</attribute></attribute>
  442 + </attributes>
  443 + </connection>
  444 + <connection>
394 445 <name>test_control&#xff08;&#x672c;&#x673a;&#xff09;</name>
395 446 <server>127.0.0.1</server>
396 447 <type>MYSQL</type>
... ... @@ -403,6 +454,62 @@
403 454 <data_tablespace/>
404 455 <index_tablespace/>
405 456 <attributes>
  457 + <attribute><code>EXTRA_OPTION_MYSQL.characterEncoding</code><attribute>utf8</attribute></attribute>
  458 + <attribute><code>EXTRA_OPTION_MYSQL.defaultFetchSize</code><attribute>500</attribute></attribute>
  459 + <attribute><code>EXTRA_OPTION_MYSQL.useCursorFetch</code><attribute>true</attribute></attribute>
  460 + <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute>
  461 + <attribute><code>FORCE_IDENTIFIERS_TO_UPPERCASE</code><attribute>N</attribute></attribute>
  462 + <attribute><code>IS_CLUSTERED</code><attribute>N</attribute></attribute>
  463 + <attribute><code>PORT_NUMBER</code><attribute>3306</attribute></attribute>
  464 + <attribute><code>PRESERVE_RESERVED_WORD_CASE</code><attribute>N</attribute></attribute>
  465 + <attribute><code>QUOTE_ALL_FIELDS</code><attribute>N</attribute></attribute>
  466 + <attribute><code>STREAM_RESULTS</code><attribute>Y</attribute></attribute>
  467 + <attribute><code>SUPPORTS_BOOLEAN_DATA_TYPE</code><attribute>Y</attribute></attribute>
  468 + <attribute><code>SUPPORTS_TIMESTAMP_DATA_TYPE</code><attribute>Y</attribute></attribute>
  469 + <attribute><code>USE_POOLING</code><attribute>N</attribute></attribute>
  470 + </attributes>
  471 + </connection>
  472 + <connection>
  473 + <name>wzk_mysql_jndi</name>
  474 + <server/>
  475 + <type>MYSQL</type>
  476 + <access>JNDI</access>
  477 + <database>wzk_mysql</database>
  478 + <port>1521</port>
  479 + <username/>
  480 + <password>Encrypted </password>
  481 + <servername/>
  482 + <data_tablespace/>
  483 + <index_tablespace/>
  484 + <attributes>
  485 + <attribute><code>EXTRA_OPTION_MYSQL.defaultFetchSize</code><attribute>500</attribute></attribute>
  486 + <attribute><code>EXTRA_OPTION_MYSQL.useCursorFetch</code><attribute>true</attribute></attribute>
  487 + <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute>
  488 + <attribute><code>FORCE_IDENTIFIERS_TO_UPPERCASE</code><attribute>N</attribute></attribute>
  489 + <attribute><code>IS_CLUSTERED</code><attribute>N</attribute></attribute>
  490 + <attribute><code>PORT_NUMBER</code><attribute>1521</attribute></attribute>
  491 + <attribute><code>PRESERVE_RESERVED_WORD_CASE</code><attribute>N</attribute></attribute>
  492 + <attribute><code>QUOTE_ALL_FIELDS</code><attribute>N</attribute></attribute>
  493 + <attribute><code>STREAM_RESULTS</code><attribute>Y</attribute></attribute>
  494 + <attribute><code>SUPPORTS_BOOLEAN_DATA_TYPE</code><attribute>Y</attribute></attribute>
  495 + <attribute><code>SUPPORTS_TIMESTAMP_DATA_TYPE</code><attribute>Y</attribute></attribute>
  496 + <attribute><code>USE_POOLING</code><attribute>N</attribute></attribute>
  497 + </attributes>
  498 + </connection>
  499 + <connection>
  500 + <name>wzk&#xff08;&#x672c;&#x673a;&#xff09;</name>
  501 + <server>localhost</server>
  502 + <type>MYSQL</type>
  503 + <access>Native</access>
  504 + <database>pdgj_wzk_sys</database>
  505 + <port>3306</port>
  506 + <username>root</username>
  507 + <password>Encrypted </password>
  508 + <servername/>
  509 + <data_tablespace/>
  510 + <index_tablespace/>
  511 + <attributes>
  512 + <attribute><code>EXTRA_OPTION_MYSQL.characterEncoding</code><attribute>utf8</attribute></attribute>
406 513 <attribute><code>EXTRA_OPTION_MYSQL.defaultFetchSize</code><attribute>500</attribute></attribute>
407 514 <attribute><code>EXTRA_OPTION_MYSQL.useCursorFetch</code><attribute>true</attribute></attribute>
408 515 <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute>
... ... @@ -570,7 +677,7 @@
570 677 </connection>
571 678 <connection>
572 679 <name>&#x516c;&#x53f8;ygjw</name>
573   - <server>192.168.168.1</server>
  680 + <server>192.168.168.178</server>
574 681 <type>ORACLE</type>
575 682 <access>Native</access>
576 683 <database>orcl</database>
... ... @@ -592,6 +699,126 @@
592 699 <attribute><code>USE_POOLING</code><attribute>N</attribute></attribute>
593 700 </attributes>
594 701 </connection>
  702 + <connection>
  703 + <name>&#x516c;&#x53f8;&#x673a;&#x52a1;_pdgj</name>
  704 + <server>192.168.168.178</server>
  705 + <type>ORACLE</type>
  706 + <access>Native</access>
  707 + <database>orcl</database>
  708 + <port>1521</port>
  709 + <username>pdgj</username>
  710 + <password>Encrypted 2be98afc86aa7f2e4cb79ce10ce96a8d0</password>
  711 + <servername/>
  712 + <data_tablespace/>
  713 + <index_tablespace/>
  714 + <attributes>
  715 + <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute>
  716 + <attribute><code>FORCE_IDENTIFIERS_TO_UPPERCASE</code><attribute>N</attribute></attribute>
  717 + <attribute><code>IS_CLUSTERED</code><attribute>N</attribute></attribute>
  718 + <attribute><code>PORT_NUMBER</code><attribute>1521</attribute></attribute>
  719 + <attribute><code>PRESERVE_RESERVED_WORD_CASE</code><attribute>N</attribute></attribute>
  720 + <attribute><code>QUOTE_ALL_FIELDS</code><attribute>N</attribute></attribute>
  721 + <attribute><code>SUPPORTS_BOOLEAN_DATA_TYPE</code><attribute>Y</attribute></attribute>
  722 + <attribute><code>SUPPORTS_TIMESTAMP_DATA_TYPE</code><attribute>Y</attribute></attribute>
  723 + <attribute><code>USE_POOLING</code><attribute>N</attribute></attribute>
  724 + </attributes>
  725 + </connection>
  726 + <connection>
  727 + <name>&#x5916;&#x7f51;vpn&#x4e34;&#x6e2f;&#x673a;&#x52a1;oracle</name>
  728 + <server>10.10.150.114</server>
  729 + <type>ORACLE</type>
  730 + <access>Native</access>
  731 + <database>helowin</database>
  732 + <port>1521</port>
  733 + <username>lgjw</username>
  734 + <password>Encrypted 2be98afc86aa7f2e4cb79ce10d295a5cd</password>
  735 + <servername/>
  736 + <data_tablespace/>
  737 + <index_tablespace/>
  738 + <attributes>
  739 + <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute>
  740 + <attribute><code>FORCE_IDENTIFIERS_TO_UPPERCASE</code><attribute>N</attribute></attribute>
  741 + <attribute><code>IS_CLUSTERED</code><attribute>N</attribute></attribute>
  742 + <attribute><code>PORT_NUMBER</code><attribute>1521</attribute></attribute>
  743 + <attribute><code>PRESERVE_RESERVED_WORD_CASE</code><attribute>N</attribute></attribute>
  744 + <attribute><code>QUOTE_ALL_FIELDS</code><attribute>N</attribute></attribute>
  745 + <attribute><code>SUPPORTS_BOOLEAN_DATA_TYPE</code><attribute>Y</attribute></attribute>
  746 + <attribute><code>SUPPORTS_TIMESTAMP_DATA_TYPE</code><attribute>Y</attribute></attribute>
  747 + <attribute><code>USE_POOLING</code><attribute>N</attribute></attribute>
  748 + </attributes>
  749 + </connection>
  750 + <connection>
  751 + <name>&#x5916;&#x7f51;&#x5357;&#x6c47;&#x673a;&#x52a1;oracle</name>
  752 + <server>58.247.254.118</server>
  753 + <type>ORACLE</type>
  754 + <access>Native</access>
  755 + <database>orcl</database>
  756 + <port>15211</port>
  757 + <username>nhjw</username>
  758 + <password>Encrypted 2be98afc86aa7f2e4cb79ce10d09aa5cd</password>
  759 + <servername/>
  760 + <data_tablespace/>
  761 + <index_tablespace/>
  762 + <attributes>
  763 + <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute>
  764 + <attribute><code>FORCE_IDENTIFIERS_TO_UPPERCASE</code><attribute>N</attribute></attribute>
  765 + <attribute><code>IS_CLUSTERED</code><attribute>N</attribute></attribute>
  766 + <attribute><code>PORT_NUMBER</code><attribute>15211</attribute></attribute>
  767 + <attribute><code>PRESERVE_RESERVED_WORD_CASE</code><attribute>N</attribute></attribute>
  768 + <attribute><code>QUOTE_ALL_FIELDS</code><attribute>N</attribute></attribute>
  769 + <attribute><code>SUPPORTS_BOOLEAN_DATA_TYPE</code><attribute>Y</attribute></attribute>
  770 + <attribute><code>SUPPORTS_TIMESTAMP_DATA_TYPE</code><attribute>Y</attribute></attribute>
  771 + <attribute><code>USE_POOLING</code><attribute>N</attribute></attribute>
  772 + </attributes>
  773 + </connection>
  774 + <connection>
  775 + <name>&#x5916;&#x7f51;&#x6768;&#x9ad8;&#x673a;&#x52a1;oracle</name>
  776 + <server>58.247.254.118</server>
  777 + <type>ORACLE</type>
  778 + <access>Native</access>
  779 + <database>orcl</database>
  780 + <port>15211</port>
  781 + <username>ygjw</username>
  782 + <password>Encrypted 2be98afc86aa7f2e4cb79ce10c795a5cd</password>
  783 + <servername/>
  784 + <data_tablespace/>
  785 + <index_tablespace/>
  786 + <attributes>
  787 + <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute>
  788 + <attribute><code>FORCE_IDENTIFIERS_TO_UPPERCASE</code><attribute>N</attribute></attribute>
  789 + <attribute><code>IS_CLUSTERED</code><attribute>N</attribute></attribute>
  790 + <attribute><code>PORT_NUMBER</code><attribute>15211</attribute></attribute>
  791 + <attribute><code>PRESERVE_RESERVED_WORD_CASE</code><attribute>N</attribute></attribute>
  792 + <attribute><code>QUOTE_ALL_FIELDS</code><attribute>N</attribute></attribute>
  793 + <attribute><code>SUPPORTS_BOOLEAN_DATA_TYPE</code><attribute>Y</attribute></attribute>
  794 + <attribute><code>SUPPORTS_TIMESTAMP_DATA_TYPE</code><attribute>Y</attribute></attribute>
  795 + <attribute><code>USE_POOLING</code><attribute>N</attribute></attribute>
  796 + </attributes>
  797 + </connection>
  798 + <connection>
  799 + <name>&#x5916;&#x7f51;&#x91d1;&#x9ad8;&#x673a;&#x52a1;oracle</name>
  800 + <server>58.247.254.118</server>
  801 + <type>ORACLE</type>
  802 + <access>Native</access>
  803 + <database>orcl</database>
  804 + <port>15211</port>
  805 + <username>jwgl</username>
  806 + <password>Encrypted 2be98afc86aa7f2e4cb79ce10d485a8d6</password>
  807 + <servername/>
  808 + <data_tablespace/>
  809 + <index_tablespace/>
  810 + <attributes>
  811 + <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute>
  812 + <attribute><code>FORCE_IDENTIFIERS_TO_UPPERCASE</code><attribute>N</attribute></attribute>
  813 + <attribute><code>IS_CLUSTERED</code><attribute>N</attribute></attribute>
  814 + <attribute><code>PORT_NUMBER</code><attribute>15211</attribute></attribute>
  815 + <attribute><code>PRESERVE_RESERVED_WORD_CASE</code><attribute>N</attribute></attribute>
  816 + <attribute><code>QUOTE_ALL_FIELDS</code><attribute>N</attribute></attribute>
  817 + <attribute><code>SUPPORTS_BOOLEAN_DATA_TYPE</code><attribute>Y</attribute></attribute>
  818 + <attribute><code>SUPPORTS_TIMESTAMP_DATA_TYPE</code><attribute>Y</attribute></attribute>
  819 + <attribute><code>USE_POOLING</code><attribute>N</attribute></attribute>
  820 + </attributes>
  821 + </connection>
595 822 <order>
596 823 <hop> <from>&#x63d2;&#x5165;&#x2f;&#x66f4;&#x65b0;bsth_c_personnel</from><to>&#x9519;&#x8bef;&#x8f93;&#x51fa;</to><enabled>Y</enabled> </hop>
597 824 <hop> <from>&#x83b7;&#x53d6;&#x53d8;&#x91cf;</from><to>&#x539f;&#x59cb;&#x7cfb;&#x7edf;&#x5bfc;&#x51fa;&#x7684;Excel&#x8f93;&#x5165;</to><enabled>Y</enabled> </hop>
... ... @@ -1129,6 +1356,12 @@
1129 1356 <condition>&#x3d;</condition>
1130 1357 <name2/>
1131 1358 </key>
  1359 + <key>
  1360 + <name>destroy</name>
  1361 + <field>destroy</field>
  1362 + <condition>&#x3d;</condition>
  1363 + <name2/>
  1364 + </key>
1132 1365 <value>
1133 1366 <name>company</name>
1134 1367 <rename>&#x6240;&#x5c5e;&#x516c;&#x53f8;</rename>
... ... @@ -1189,6 +1422,11 @@
1189 1422 <rename>&#x5907;&#x6ce8;</rename>
1190 1423 <update>Y</update>
1191 1424 </value>
  1425 + <value>
  1426 + <name>destroy</name>
  1427 + <rename>destroy</rename>
  1428 + <update>Y</update>
  1429 + </value>
1192 1430 </lookup>
1193 1431 <cluster_schema/>
1194 1432 <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI>
... ... @@ -1213,7 +1451,7 @@
1213 1451 <optimizationLevel>9</optimizationLevel>
1214 1452 <jsScripts> <jsScript> <jsScript_type>0</jsScript_type>
1215 1453 <jsScript_name>Script 1</jsScript_name>
1216   - <jsScript_script>&#x2f;&#x2f;Script here&#xa;&#xa;var up_code &#x3d; &#x27;88&#x27;&#x3b;&#xa;var sexType &#x3d; &#x27;sexType&#x27;&#x3b;&#xa;var gzType &#x3d; &#x27;gzType&#x27;&#x3b;</jsScript_script>
  1454 + <jsScript_script>&#x2f;&#x2f;Script here&#xa;&#xa;var up_code &#x3d; &#x27;88&#x27;&#x3b;&#xa;var sexType &#x3d; &#x27;sexType&#x27;&#x3b;&#xa;var gzType &#x3d; &#x27;gzType&#x27;&#x3b;&#xa;&#xa;var destroy &#x3d; 0&#x3b;</jsScript_script>
1217 1455 </jsScript> </jsScripts> <fields> <field> <name>up_code</name>
1218 1456 <rename>up_code</rename>
1219 1457 <type>String</type>
... ... @@ -1232,6 +1470,12 @@
1232 1470 <length>-1</length>
1233 1471 <precision>-1</precision>
1234 1472 <replace>N</replace>
  1473 + </field> <field> <name>destroy</name>
  1474 + <rename>destroy</rename>
  1475 + <type>Integer</type>
  1476 + <length>-1</length>
  1477 + <precision>-1</precision>
  1478 + <replace>N</replace>
1235 1479 </field> </fields> <cluster_schema/>
1236 1480 <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI>
1237 1481 <xloc>414</xloc>
... ...
src/main/resources/static/pages/scheduleApp/module/basicInfo/employeeInfoManage/detail.html
  View file @d5a1fab
... ... @@ -89,12 +89,12 @@
89 89 ng-value="ctrl.employeeInfoForDetail.posts | dict:'gzType':'未知'" readonly/>
90 90 </div>
91 91 </div>
92   - <div class="form-group">
93   - <label class="col-md-2 control-label">与人事库同步：</label>
94   - <div class="col-md-4">
95   - <sa-Radiogroup model="ctrl.employeeInfoForDetail.locked" disabled="true" dicgroup="isSyncPerson" name="locked"></sa-Radiogroup>
96   - </div>
97   - </div>
  92 + <!--<div class="form-group">-->
  93 + <!--<label class="col-md-2 control-label">与人事库同步：</label>-->
  94 + <!--<div class="col-md-4">-->
  95 + <!--<sa-Radiogroup model="ctrl.employeeInfoForDetail.locked" disabled="true" dicgroup="isSyncPerson" name="locked"></sa-Radiogroup>-->
  96 + <!--</div>-->
  97 + <!--</div>-->
98 98  
99 99 <!-- 其他form-group -->
100 100  
... ... @@ -102,4 +102,4 @@
102 102 </form>
103 103 </div>
104 104  
105   -</div>
106 105 \ No newline at end of file
  106 +</div>
... ...
src/main/resources/static/pages/scheduleApp/module/basicInfo/employeeInfoManage/edit.html
  View file @d5a1fab
... ... @@ -154,10 +154,17 @@
154 154 </div>
155 155 </div>
156 156  
  157 + <!--<div class="form-group">-->
  158 + <!--<label class="col-md-2 control-label">与人事库同步：</label>-->
  159 + <!--<div class="col-md-4">-->
  160 + <!--<sa-Radiogroup model="ctrl.employeeInfoForSave.locked" dicgroup="isSyncPerson" name="locked"></sa-Radiogroup>-->
  161 + <!--</div>-->
  162 + <!--</div>-->
  163 +
157 164 <div class="form-group">
158   - <label class="col-md-2 control-label">与人事库同步：</label>
  165 + <label class="col-md-2 control-label">是否停用：</label>
159 166 <div class="col-md-4">
160   - <sa-Radiogroup model="ctrl.employeeInfoForSave.locked" dicgroup="isSyncPerson" name="locked"></sa-Radiogroup>
  167 + <sa-Radiogroup model="ctrl.employeeInfoForSave.destroy_temp" dicgroup="truefalseType" name="destroy_temp"></sa-Radiogroup>
161 168 </div>
162 169 </div>
163 170  
... ... @@ -188,4 +195,4 @@
188 195 </form>
189 196 </div>
190 197  
191   -</div>
192 198 \ No newline at end of file
  199 +</div>
... ...
src/main/resources/static/pages/scheduleApp/module/basicInfo/employeeInfoManage/form.html
  View file @d5a1fab
... ... @@ -153,10 +153,17 @@
153 153 </div>
154 154 </div>
155 155  
  156 + <!--<div class="form-group">-->
  157 + <!--<label class="col-md-2 control-label">与人事库同步：</label>-->
  158 + <!--<div class="col-md-4">-->
  159 + <!--<sa-Radiogroup model="ctrl.employeeInfoForSave.locked" dicgroup="isSyncPerson" name="locked"></sa-Radiogroup>-->
  160 + <!--</div>-->
  161 + <!--</div>-->
  162 +
156 163 <div class="form-group">
157   - <label class="col-md-2 control-label">与人事库同步：</label>
  164 + <label class="col-md-2 control-label">是否停用：</label>
158 165 <div class="col-md-4">
159   - <sa-Radiogroup model="ctrl.employeeInfoForSave.locked" dicgroup="isSyncPerson" name="locked"></sa-Radiogroup>
  166 + <sa-Radiogroup model="ctrl.employeeInfoForSave.destroy_temp" dicgroup="truefalseType" name="destroy_temp"></sa-Radiogroup>
160 167 </div>
161 168 </div>
162 169  
... ... @@ -187,4 +194,4 @@
187 194 </form>
188 195 </div>
189 196  
190   -</div>
191 197 \ No newline at end of file
  198 +</div>
... ...
src/main/resources/static/pages/scheduleApp/module/basicInfo/employeeInfoManage/module.js
  View file @d5a1fab
... ... @@ -345,13 +345,15 @@ angular.module(&#39;ScheduleApp&#39;).controller(
345 345 'EmployeeInfoManageService',
346 346 '$stateParams',
347 347 '$state',
  348 + '$scope',
348 349 'DataStore',
349   - function(service, $stateParams, $state, DataStore) {
  350 + function(service, $stateParams, $state, $scope, DataStore) {
350 351 var self = this;
351 352 var Employee = service.getQueryClass();
352 353  
353 354 // 欲保存的busInfo信息，绑定
354 355 self.employeeInfoForSave = new Employee;
  356 + self.employeeInfoForSave.destroy_temp = false; // 默认停用状态
355 357  
356 358 // 获取传过来的id，有的话就是修改，获取一遍数据
357 359 var id = $stateParams.id;
... ... @@ -361,19 +363,25 @@ angular.module(&#39;ScheduleApp&#39;).controller(
361 363 if (!self.employeeInfoForSave.jobCodeori) {
362 364 self.employeeInfoForSave.jobCodeori = self.employeeInfoForSave.jobCode.split("-")[1];
363 365 }
  366 + // 停用状态
  367 + if (self.employeeInfoForSave.destroy) {
  368 + self.employeeInfoForSave.destroy_temp = true;
  369 + } else {
  370 + self.employeeInfoForSave.destroy_temp = false;
  371 + }
364 372 });
365 373  
366 374 }
367 375  
368 376 // 提交方法
369 377 self.submit = function() {
370   - // 员工编号=公司编码_工号
371   - var gh = self.employeeInfoForSave.jobCodeori;
372   - self.employeeInfoForSave.jobCode = self.employeeInfoForSave.companyCode + "-" + gh;
373   -
374   - if (self.employeeInfoForSave.destroy !== 1) { // 0在职，1停用
  378 + // 停用状态 0在职，1停用
  379 + if (self.employeeInfoForSave.destroy_temp) {
  380 + self.employeeInfoForSave.destroy = 1;
  381 + } else {
375 382 self.employeeInfoForSave.destroy = 0;
376 383 }
  384 + delete self.employeeInfoForSave.destroy_temp;
377 385  
378 386 console.log(self.employeeInfoForSave);
379 387  
... ... @@ -384,6 +392,17 @@ angular.module(&#39;ScheduleApp&#39;).controller(
384 392 });
385 393 };
386 394  
  395 + $scope.$watch(
  396 + function() {
  397 + return self.employeeInfoForSave.jobCodeori;
  398 + },
  399 + function(n, o) {
  400 + // 员工编号=公司编码_工号
  401 + self.employeeInfoForSave.jobCode = self.employeeInfoForSave.companyCode + "-" + n;
  402 + },
  403 + true
  404 + );
  405 +
387 406 }
388 407 ]
389 408 );
... ...