瀏覽代碼

公众号迁移

caotao 5 年之前
父節點
當前提交
b990abcd25

+ 3 - 0
admin-ui/app/whepi/home/selectLYbumen.js

@@ -16,6 +16,9 @@ define(function (require) {
         columns: [[
           {title: 'ID', field: 'unitId', hidden: true},
           {title: '部门', field: 'unit'},
+          {title: '公司', field: 'uptownName'},
+          {title: '创建时间', field: 'dateCreate'},
+          {title: '更新时间', field: 'dateUpdate'},
         ]]
       }
     };

+ 2 - 1
whepi-web/src/main/java/com/bofeng/dao/UptownUnitMapper.java

@@ -48,7 +48,8 @@ public interface UptownUnitMapper extends BaseMapper<UptownUnit> {
     @Select("select * from sys_department where status = 1 and unit_id = #{unitId}")
     List<Department> getDepartmentByUnit(@Param("unitId") Long unitId);
 
-    @Select("select * from(select unit_id,CONCAT(ridgepole,unit) as unit from sys_uptown_unit where status = 1 and uptown_id = 1238790987234) tt where unit like concat('%', #{unit}, '%')")
+    @Select("select * from(select unit.unit_id,CONCAT(unit.ridgepole,unit.unit) as unit,'凌云集团' as uptownName,DATE_FORMAT(unit.time_create,'%Y-%m-%d')  as dateCreate,DATE_FORMAT(unit.time_update,'%Y-%m-%d')  as dateUpdate from sys_uptown_unit unit left join sys_uptown uptown on uptown.uptown_id = unit.uptown_id " +
+            " where unit.status = 1 and unit.uptown_id = 1238790987234) tt where unit like concat('%', #{unit}, '%')")
     List<UptownUnit> getDLYbumen(@Param("unit") String unit);
 
     @Select("select * from(select unit_id,CONCAT(ridgepole,unit) as unit from sys_uptown_unit where status = 1 and uptown_id = 100000002) tt where unit like concat('%', #{unit}, '%')")

+ 6 - 0
whepi-web/src/main/java/com/bofeng/entity/UptownUnit.java

@@ -42,6 +42,12 @@ public class UptownUnit {
     @TableField(exist = false)
     private DateTime timeCreate;
 
+    @TableField(exist = false)
+    private String dateCreate;
+
+    @TableField(exist = false)
+    private String dateUpdate;
+
 //    @TableField("user_update")
 //    private Long userUpdate;