Merge remote-tracking branch 'origin/master'

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml

@@ -414,6 +414,6 @@
         select su.token
         from sys_staffinfo si
                  left join sys_user su on su.staffSid = si.sid
-        where si.personTypeKey = '01'
+        where si.personTypeKey = '01' and length(su.token)>0
     </select>
 </mapper>

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillService.java

@@ -41,6 +41,7 @@ import com.yxt.common.core.vo.PagerVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -147,9 +148,16 @@ public class AsBusreserveBillService extends MybatisBaseService<AsBusreserveBill
     }
 
     public AsBusreserveBillDetailsVo fetchDetailsVoBySid(String sid) {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         AsBusreserveBill entity = fetchBySid(sid);
         AsBusreserveBillDetailsVo vo = new AsBusreserveBillDetailsVo();
         BeanUtil.copyProperties(entity, vo);
+        if (null != entity.getReserveStart()) {
+            vo.setReserveStart(sdf.format(entity.getReserveStart()));
+        }
+        if (null != entity.getReserveEnd()) {
+            vo.setReserveEnd(sdf.format(entity.getReserveEnd()));
+        }
         List<AsbillSitemVo> sitemVos = new ArrayList<>();
         List<AsBusreserveBillSitem> asBusreserveBillSitems = asBusreserveBillSitemService.fetchByMainSid(sid);
         if (!asBusreserveBillSitems.isEmpty()) {

yxt-as/target/classes/banner.txt

@@ -1,13 +0,0 @@
-  ,----..                     ____
- /   /   \                  ,'  , `.
-|   :     :  ,---.       ,-+-,.' _ |                   ,---.        ,---,
-.   |  ;. / '   ,'\   ,-+-. ;   , ||                  '   ,'\   ,-+-. /  |
-.   ; /--` /   /   | ,--.'|'   |  || ,---.           /   /   | ,--.'|'   |
-;   | ;   .   ; ,. :|   |  ,', |  |,/     \         .   ; ,. :|   |  ,"' |
-|   : |   '   | |: :|   | /  | |--'/    /  |        '   | |: :|   | /  | |
-.   | '___'   | .; :|   : |  | ,  .    ' / |        '   | .; :|   | |  | |
-'   ; : .'|   :    ||   : |  |/   '   ;   /|        |   :    ||   | |  |/
-'   | '/  :\   \  / |   | |`-'    '   |  / |         \   \  / |   | |--'
-|   :    /  `----'  |   ;/        |   :    |          `----'  |   |/
- \   \ .'           '---'          \   \  /                   '---'
-  `---`                             `----'

yxt-as/target/classes/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yxt.anrui.as.biz.asbusrepairbill.AsBusrepairBillMapper">
-    <select id="getList" resultType="com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBillListVo">
-        select sid, billNo
-        from as_busrepair_bill
-        where nodeCode = 2
-          and billType = 1
-    </select>
-</mapper>

yxt-as/target/classes/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillMapper.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yxt.anrui.as.biz.asbusrepairinventorybill.AsBusrepairInventorybillMapper">
-    <select id="pageList" resultType="com.yxt.anrui.as.api.asbusrepairinventorybill.AsBusrepairInventorybillVo">
-        select sid, billNo, createByName, busTypeValue, warehouseManager
-        from as_busrepair_inventorybill
-        <where>
-            ${ew.sqlSegment}
-        </where>
-    </select>
-</mapper>

yxt-as/target/classes/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailMapper.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yxt.anrui.as.biz.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetailMapper">
-    <delete id="deleteByMainSid">
-        delete
-        from as_busrepair_inventorybill_detail
-        where billSid = #{sid}
-    </delete>
-
-    <select id="selectByMainSid"
-            resultType="com.yxt.anrui.as.api.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetail">
-        select *
-        from as_busrepair_inventorybill_detail
-        where billSid = #{sid}
-    </select>
-</mapper>

yxt-as/target/classes/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillMapper.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yxt.anrui.as.biz.asbusreservebill.AsBusreserveBillMapper">
-    <!--    <where> ${ew.sqlSegment} </where>-->
-    <!--    ${ew.customSqlSegment} -->
-
-
-</mapper>

yxt-as/target/classes/com/yxt/anrui/as/biz/asserviceattachitem/AsServiceAttachItemMapper.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yxt.anrui.as.biz.asserviceattachitem.AsServiceAttachItemMapper">
-    <!--    <where> ${ew.sqlSegment} </where>-->
-    <!--    ${ew.customSqlSegment} -->
-
-
-    <select id="selectPageVo" resultType="com.yxt.anrui.as.api.asserviceattachitem.AsServiceAttachItemVo">
-        SELECT * FROM as_service_attachitem <where> ${ew.sqlSegment} </where>
-    </select>
-</mapper>

yxt-as/target/classes/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupMapper.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yxt.anrui.as.biz.asservicegroup.AsServiceGroupMapper">
-<!--    <where> ${ew.sqlSegment} </where>-->
-<!--    ${ew.customSqlSegment} -->
-	<select id="selectPageVo" resultType="com.yxt.anrui.as.api.asservicegroup.AsServiceGroupVo">
-		SELECT * FROM as_service_group <where> ${ew.sqlSegment} </where>
-	</select>
-	
-	<select id="selectListAllVo" resultType="com.yxt.anrui.as.api.asservicegroup.AsServiceGroupVo">
-		SELECT * FROM as_service_group <where> ${ew.sqlSegment} </where>
-	</select>
-</mapper>

yxt-as/target/classes/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemMapper.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yxt.anrui.as.biz.asserviceitem.AsServiceItemMapper">
-    <!--    <where> ${ew.sqlSegment} </where>-->
-    <!--    ${ew.customSqlSegment} -->
-
-
-    <select id="selectPageVo" resultType="com.yxt.anrui.as.api.asserviceitem.AsServiceItemVo">
-        SELECT * FROM as_service_item <where> ${ew.sqlSegment} </where>
-    </select>
-    <select id="getServiceType" resultType="com.yxt.anrui.as.api.asserviceitem.ServiceTypeVo">
-        SELECT
-            sid AS serviceTypeSid,
-            serviceTypeName AS serviceType
-        FROM
-            as_service_type
-        WHERE useOrgSid = #{useOrgSid}
-    </select>
-</mapper>

yxt-as/target/classes/com/yxt/anrui/as/biz/asservicepackage/AsServicePackageMapper.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yxt.anrui.as.biz.asservicepackage.AsServicePackageMapper">
-<!--    <where> ${ew.sqlSegment} </where>-->
-<!--    ${ew.customSqlSegment} -->
-	<select id="selectPageVo" resultType="com.yxt.anrui.as.api.asservicepackage.AsServicePackageVo">
-		SELECT * FROM as_service_package <where> ${ew.sqlSegment} </where>
-	</select>
-	
-	<select id="selectListAllVo" resultType="com.yxt.anrui.as.api.asservicepackage.AsServicePackageVo">
-		SELECT * FROM as_service_package <where> ${ew.sqlSegment} </where>
-	</select>
-</mapper>

yxt-as/target/classes/com/yxt/anrui/as/biz/asservicepackageaitem/AsServicePackageAitemMapper.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yxt.anrui.as.biz.asservicepackageaitem.AsServicePackageAitemMapper">
-<!--    <where> ${ew.sqlSegment} </where>-->
-<!--    ${ew.customSqlSegment} -->
-	<select id="selectPageVo" resultType="com.yxt.anrui.as.api.asservicepackageaitem.AsServicePackageAitemVo">
-		SELECT * FROM as_service_package_aitem <where> ${ew.sqlSegment} </where>
-	</select>
-	
-	<select id="selectListAllVo" resultType="com.yxt.anrui.as.api.asservicepackageaitem.AsServicePackageAitemVo">
-		SELECT * FROM as_service_package_aitem <where> ${ew.sqlSegment} </where>
-	</select>
-</mapper>