完善机构扩展信息,修改作息

soc-modules/soc-modules-gen/src/main/resources/vm/java/sub-domain.java.vm

@@ -41,6 +41,7 @@ private static final long serialVersionUID=1L;
                 #set($comment=$column.columnComment)
             #end
             #if($parentheseIndex != -1)
+
             @ApiModelProperty(value = "${comment}" , notes = "$column.readConverterExp()")
             #elseif($column.javaType == 'Date')
             @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/mapper/SysWorkTimeMapper.java

@@ -30,7 +30,7 @@ public interface SysWorkTimeMapper extends BaseMapper<SysWorkTime> {
      */
     public SysWorkTime selectSysWorkTimeById(String id);
     List<SysWorkTime> findByOrgAndMonth(SysWorkTime request);
-    List<SysWorkTime> findByYmd( List<Long> orgId, String date);
+    List<SysWorkTime> findByYmd( @Param("orgIds") List<Long> orgIds,@Param("date") String date);
     /**
      * 查询【请填写功能名称】列表
      *

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysWorkTimeMapper.xml

@@ -142,7 +142,7 @@
     </select>
     <select id="findByYmd" resultType="com.xunmei.system.domain.SysWorkTime">
         select * from sys_work_time where org_id in
-        <foreach item="orgId" collection="list" open="(" separator="," close=")">
+        <foreach item="orgId" collection="orgIds" open="(" separator="," close=")">
             #{orgId}
         </foreach>