Skip to content

C
cloud-fb
Commit bf3aefdc by 杨清松
Options

岗位管理,出差申请字段更改

parent 229a0ee5
Showing with 41 additions and 19 deletions
backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/config/StationConfiguration.java
package com.xyst.dinas.biz.config;
import org.springframework.context.annotation.Bean;
import com.xyst.dinas.biz.dao.PositionDao;
import com.xyst.dinas.biz.internal.dao.PositionDaoImpl;
import com.xyst.dinas.biz.internal.service.PositionServiceImpl;
import com.xyst.dinas.biz.service.PositionService;
import com.xyst.dinas.biz.web.PositionController;
public class StationConfiguration {
@Bean
public PositionController positionController() {
return new PositionController();
}
@Bean
public PositionService positionService() {
return new PositionServiceImpl();
}
@Bean
public PositionDao positionDao() {
return new PositionDaoImpl();
}
}
backend/xyst.dinas.biz/src/main/resources/META-INF/spring.factories
# Auto Configure
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
com.xyst.dinas.biz.config.OaConfiguration
\ No newline at end of file
com.xyst.dinas.biz.config.StationConfiguration
\ No newline at end of file
backend/xyst.dinas.oa/src/main/java/com/xyst/dinas/oa/web/SealBorrowController.java
......@@ -27,7 +27,7 @@ public class SealBorrowController {
@ResponseBody
@RequestMapping(value = "/oa/sealBorrow/submitFlow", method = RequestMethod.POST, consumes = "application/json")
public Object repairDealWayAccept(@RequestBody String body) {
public Object submitFlow(@RequestBody String body) {
JSONObject obj = new JSONObject(body);
UUID id = UUID.fromString(obj.getString("id"));
sealBorrowService.submitFlow(id);
......
backend/xyst.dinas.oa/src/main/model/com/xyst/dinas/oa/datamodel/BusinessTripApply.mk
......@@ -55,7 +55,7 @@
<annotation id='0bf95ef1-aafa-466d-8528-140c69adb2c5' attributeId='1a6004f1-98a9-4234-bec3-21f5cc4fa11c' name='length' value='100'>
</annotation>
</attribute>
<attribute id='2abe8b56-e318-4b33-a51c-e4ba91e0f3c5' name='lendReason' columnName='lend_reason' title='借出事由' type='string' default='' precision='' isArray='false'>
<attribute id='2abe8b56-e318-4b33-a51c-e4ba91e0f3c5' name='businessTripReason' columnName='business_trip_reason' title='出差事由' type='string' default='' precision='' isArray='false'>
<annotation id='225c9526-139f-4ebf-a8c7-3a889dd0977c' attributeId='a1d41757-f413-4921-a65c-82f3de60ebcc' name='length' value='500'>
</annotation>
</attribute>
......
backend/xyst.dinas.oa/src/main/model/com/xyst/dinas/oa/query/BusinessTripApply.mk
......@@ -177,7 +177,7 @@
<description></description>
</field>
<field title='借出事由'>
<name>lendReason</name>
<name>businessTripReason</name>
<type>string</type>
<ref>
<type></type>
......
backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/BusinessTripApply$sequence.jmx
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
<specification>1.0</specification>
<id>4dd0b4b5-1873-4239-a96d-4887dcf66a85</id>
<id>8cd1acd2-ea6a-46d7-8545-326c99a5bb89</id>
<name>com.xyst.dinas.oa.bill.BusinessTripApply$sequence</name>
<title>出差申请$sequence</title>
<description>出差申请</description>
......
backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/BusinessTripApply$serial.jmx
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
<specification>1.0</specification>
<id>014e5dc0-0048-4e97-a2d9-ca9dad8b5534</id>
<id>b02bb6c4-3827-4102-b930-6f13435a7e76</id>
<name>com.xyst.dinas.oa.bill.BusinessTripApply$serial</name>
<title>出差申请$serial</title>
<description>出差申请</description>
......
backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/BusinessTripApply.jmx
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
<specification>1.0</specification>
<id>dff0415d-7421-405f-908a-cf22c819280b</id>
<id>eb88e653-968c-47ee-bb6c-9a4518ad5071</id>
<name>com.xyst.dinas.oa.bill.BusinessTripApply</name>
<title>出差申请</title>
<description>出差申请</description>
......
backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/SealBorrow$sequence.jmx
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
<specification>1.0</specification>
<id>fdb23a0a-f6d9-4aa4-a2cc-93aae41d2675</id>
<id>ff03f6c5-3843-4d65-9ece-6a0ae4b98e9a</id>
<name>com.xyst.dinas.oa.bill.SealBorrow$sequence</name>
<title>证章借出$sequence</title>
<description>证章借出</description>
......
backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/SealBorrow$serial.jmx
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
<specification>1.0</specification>
<id>8213cf3a-09bd-4ae7-8ed5-dae652808ba7</id>
<id>650e4eac-4ab0-4704-8b43-e04212eed383</id>
<name>com.xyst.dinas.oa.bill.SealBorrow$serial</name>
<title>证章借出$serial</title>
<description>证章借出</description>
......
backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/SealBorrow.jmx
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
<specification>1.0</specification>
<id>56521671-a8be-4ff9-a7bd-2cf64f5caa8e</id>
<id>425c9108-d226-4210-ae7b-c22513b1b5f9</id>
<name>com.xyst.dinas.oa.bill.SealBorrow</name>
<title>证章借出</title>
<description>证章借出</description>
......
backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/UseCarApply$sequence.jmx
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
<specification>1.0</specification>
<id>b3f45efd-44a7-440d-a95b-aa2d5a855b4a</id>
<id>8012c173-4025-4dcb-946f-2f715ea8e7dc</id>
<name>com.xyst.dinas.oa.bill.UseCarApply$sequence</name>
<title>用车申请$sequence</title>
<description>用车申请</description>
......
backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/UseCarApply$serial.jmx
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
<specification>1.0</specification>
<id>e6ccf0e5-133c-408e-a2ef-e8f6a7cc2863</id>
<id>acc789ac-dd0b-4580-b271-0cc9931947a6</id>
<name>com.xyst.dinas.oa.bill.UseCarApply$serial</name>
<title>用车申请$serial</title>
<description>用车申请</description>
......
backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/UseCarApply.jmx
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
<specification>1.0</specification>
<id>50117aa0-4735-460c-a053-756e68b06eb1</id>
<id>3f8ff842-a50c-4b5b-a730-f4ccc9371b46</id>
<name>com.xyst.dinas.oa.bill.UseCarApply</name>
<title>用车申请</title>
<description>用车申请</description>
......
backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/datamodel/BusinessTripApply.jmx
......@@ -118,8 +118,8 @@
</m:annotation>
</m:annotations>
<m:id>2abe8b56-e318-4b33-a51c-e4ba91e0f3c5</m:id>
<m:name>lendReason</m:name>
<m:title>借出事由</m:title>
<m:name>businessTripReason</m:name>
<m:title>出差事由</m:title>
<m:type>string</m:type>
<m:description></m:description>
<m:default></m:default>
......
backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/query/BusinessTripApply.jmx
......@@ -201,7 +201,7 @@
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>lendReason</m:name>
<m:name>businessTripReason</m:name>
<m:title>借出事由</m:title>
<m:type>string</m:type>
<m:ref>
......
backend/xyst.dinas.oa/src/main/resources/config/BusinessTripApply.hbm.xml
......@@ -66,8 +66,8 @@
<property name="leaderJobLevel" type="nstring" not-null="false">
<column name="leader_job_level" length="100"></column>
</property>
<property name="lendReason" type="nstring" not-null="false">
<column name="lend_reason" length="500"></column>
<property name="businessTripReason" type="nstring" not-null="false">
<column name="business_trip_reason" length="500"></column>
</property>
<property name="departmentManagerOpinion" type="nstring" not-null="false">
<column name="department_manager_opinion" length="500"></column>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment