LY byx

master/pom.xml

@@ -387,7 +387,7 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-freemarker</artifactId>
-            <version>2.1.2.RELEASE</version>
+            <version>2.3.12.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.itextpdf</groupId>

master/src/main/resources/application.yml

@@ -56,6 +56,9 @@ spring:
   freemarker:
     checkTemplateLocation: false
     classic-compatible: true
+    suffix: .ftlh
+    ettings:
+      recognize_standard_file_extensions: true
   # 文件上传
   servlet:
      multipart:

master/src/main/resources/mybatis/training/TByxWorklicenseMapper.xml

@@ -54,7 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 <where>
             <if test="plantCode != null  and plantCode != ''"> and plant_code = #{plantCode}</if>
-            <if test="name != null  and name != ''"> and name like concat(concat('%', #{name}), '%')</if>
+            <if test="name != null  and name != ''"> and d.name like concat(concat('%', #{name}), '%')</if>
             <if test="employeeid != null  and employeeid != ''"> and employeeid = #{employeeid}</if>
             <if test="classes != null  and classes != ''"> and classes = #{classes}</if>
             <if test="post != null  and post != ''"> and post = #{post}</if>

master/src/main/resources/mybatis/training/TTrainingRegularMapper.xml

@@ -34,7 +34,7 @@
     <sql id="selectTTrainingRegularVo">
         select d.id, t.name, d.course_code, d.item, d.actualpost_id, d.remarks, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.plan_trainingdate, d.actual_completedate, d.lecturer, d.hour, d.year, d.designated_position, d.designated_staff, d.involved_moc, d.not_plan, d.not_trainingdate, d.designated_other ,s.dept_name from t_training_regular d
       left join sys_dept s on s.dept_id = d.dept_id
-      left join t_staffmgr t on t.staffid = d.lecturer
+      left join t_staffmgr t on t.staffid = d.lecturer and t.del_flag = 0
     </sql>
 
     <select id="selectTTrainingRegularList" parameterType="TTrainingRegular" resultMap="TTrainingRegularResult">

master/src/main/resources/mybatis/training/TTrainingrecordsMapper.xml

@@ -51,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
         <where>
             <if test="year != null "> and year = #{year}</if>
-            <if test="name != null  and name != ''"> and name like concat(concat('%', #{name}), '%')</if>
+            <if test="name != null  and name != ''"> and d.name like concat(concat('%', #{name}), '%')</if>
             <if test="employeeid != null  and employeeid != ''"> and employeeid like concat(concat('%', #{employeeid}), '%')</if>
             <if test="classes != null  and classes != ''"> and classes = #{classes}</if>
             <if test="onboard != null  and onboard != ''"> and onboard = #{onboard}</if>

ui/src/views/front/annualOutput.vue

@@ -7,7 +7,7 @@
             <div class="m-7xz1 xzleft"></div>
             <div class="m-7xz2"></div>
             <div class="m-7xz3 xzleft"></div>
-            <div class="m-7zt1">{{ $t('年产量') }}</div>
+            <div class="m-7zt1">{{ $t('年产量') }}%</div>
             <div class="m-7zt2" id="sx1">{{ dashboarddata.outputAnnual }}</div>
           </div>
         </div>

ui/src/views/login.vue

@@ -75,7 +75,7 @@
           <!--<span v-else>{{ $t('login.loading') }}</span>-->
         <!--</el-button>-->
       <!--</el-form-item>-->
-      <el-form-item style="width:100%;display:none;">
+      <el-form-item style="width:100%;">
         <el-button
           :loading="loading"
           size="medium"
@@ -83,14 +83,14 @@
           style="width:100%;"
           @click.native.prevent="doAzureLogin"
         >
-          <span v-if="!loading"> Azure登录 </span>
+          <span v-if="!loading"> BASF员工卡登录(Beta) </span>
           <span v-else>{{ $t('login.loading') }}</span>
         </el-button>
       </el-form-item>
     </el-form>
     <!--  底部  -->
     <div class="el-login-footer">
-      <span>Copyright © 2020-2022 Seashore.ept All Rights Reserved.</span>
+      <span>Copyright © 2020-2024 Seashore.ept All Rights Reserved.</span>
     </div>
   </div>
 </template>