소스 검색

生成源码

baolei 1 개월 전
부모
커밋
1c0a1d1cbe

+ 2 - 0
src/main/java/com/hzy/project/business/subject/service/impl/SalarySubjectServiceImpl.java

@@ -5,6 +5,7 @@ import java.util.List;
 
 import com.hzy.common.enums.EDelFlag;
 import com.hzy.common.utils.DateUtils;
+import com.hzy.common.utils.RMBUtil;
 import com.hzy.common.utils.security.ShiroUtils;
 import com.hzy.project.business.customer.domain.Customer;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -139,6 +140,7 @@ public class SalarySubjectServiceImpl implements ISalarySubjectService
         if (!sorteds.isEmpty()) {
             int sort = pageSize * (pageNumber - 1) + 1;
             for (SalarySubject entity : sorteds) {
+                entity.setPercent(RMBUtil.yuanToFen(entity.getPercent()));
                 entity.setUpdateBy(ShiroUtils.getLoginName());
                 entity.setUpdateTime(now);
                 entity.setSort(Long.valueOf(sort++));

+ 1 - 0
src/main/resources/mybatis/business/SalarySubjectMapper.xml

@@ -33,6 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="formula != null "> and formula = #{formula}</if>
             <if test="delFlag != null"> and delFlag = #{delFlag}</if>
         </where>
+        order by sort
     </select>
     
     <select id="selectSalarySubjectBySalarySubjectId" parameterType="Long" resultMap="SalarySubjectResult">

+ 5 - 1
src/main/resources/templates/business/subject/subject.html

@@ -56,11 +56,15 @@
                 </a>
             </div>
             <div class="col-sm-12 select-table table-striped">
-                <table id="bootstrap-table"></table>
+                <table id="bootstrap-table"
+                       data-mobile-responsive="true"
+                       data-use-row-attr-func="true"
+                       data-reorderable-rows="true"></table>
             </div>
         </div>
     </div>
     <th:block th:include="include :: footer" />
+     <th:block th:include="include :: bootstrap-table-reorder-rows-js"/>
     <script th:inline="javascript">
         var editFlag = [[${@permission.hasPermi('business:subject:edit')}]];
         var removeFlag = [[${@permission.hasPermi('business:subject:remove')}]];

+ 7 - 7
src/main/resources/templates/login.html

@@ -30,13 +30,13 @@
                     </div>
                     <div class="m-b"></div>
                     <h4>欢迎使用 <strong>华智昀账目</strong></h4>
-                    <ul class="m-b">
-                        <li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> SpringBoot</li>
-                        <li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> Mybatis</li>
-                        <li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> Shiro</li>
-                        <li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> Thymeleaf</li>
-                        <li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> Bootstrap</li>
-                    </ul>
+<!--                    <ul class="m-b">-->
+<!--                        <li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> SpringBoot</li>-->
+<!--                        <li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> Mybatis</li>-->
+<!--                        <li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> Shiro</li>-->
+<!--                        <li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> Thymeleaf</li>-->
+<!--                        <li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> Bootstrap</li>-->
+<!--                    </ul>-->
                     <strong th:if="${isAllowRegister}">还没有账号? <a th:href="@{/register}">立即注册&raquo;</a></strong>
                 </div>
             </div>