bug修改

attendance-performance-manager/src/main/resources/sqlmap/module/window/WindowOwnerMapper.xml

@@ -83,6 +83,12 @@
             </if>
         </trim>
     </sql>
+    <!-- 子表所有列 -->
+    <sql id="_columns_sub">
+        <trim suffixOverrides="," suffix="">
+            b.id,b.ownerId,b.staffId,b.remark,b.createTime,b.createUserId,b.updateUserId,b.updateTime,
+        </trim>
+    </sql>
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="WindowOwnerEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_xhx_window_owner

common-lib/src/main/java/com/mortals/xhx/common/pdu/window/WindowPdu.java

+package com.mortals.xhx.common.pdu.window;
+
+import com.mortals.framework.model.BaseEntityLong;
+import lombok.Data;
+
+@Data
+public class WindowPdu extends BaseEntityLong {
+    /**
+     * 站点ID
+     */
+    private Long siteId;
+    /**
+     * 站点名称
+     */
+    private String siteName;
+    /**
+     * 部门ID
+     */
+    private Long deptId;
+    /**
+     * 部门名称
+     */
+    private String deptName;
+    /**
+     * 窗口名称
+     */
+    private String name;
+    /**
+     * 英语窗口名
+     */
+    private String englishName;
+    /**
+     * 区域
+     */
+    private String region;
+    /**
+     * 英语区域
+     */
+    private String englishRegion;
+    /**
+     * 窗口编号
+     */
+    private String fromnum;
+    /**
+     * 红旗窗口 (1.是，0.否)
+     */
+    private Integer hongqi;
+    /**
+     * 无人值守(1.是)
+     */
+    private Integer duty;
+    /**
+     * 显示内容
+     */
+    private String dutyContent;
+    /**
+     * 显示英文
+     */
+    private String dutyEnglish;
+    /**
+     * 备注
+     */
+    private String summary;
+    /**
+     * 楼栋
+     */
+    private Integer building;
+    /**
+     * 楼层
+     */
+    private Integer level;
+    /**
+     * 名称描述
+     */
+    private String nameDesc;
+    /**
+     * 英文名称描述
+     */
+    private String englishNameDesc;
+
+    /**
+     * 大厅ID
+     */
+    private Long hallId;
+    /**
+     * 大厅名称
+     */
+    private String hallName;
+
+}

common-lib/src/main/java/com/mortals/xhx/feign/window/IWindowFeign.java

+package com.mortals.xhx.feign.window;
+
+import com.mortals.framework.common.Rest;
+import com.mortals.xhx.common.pdu.RespData;
+import com.mortals.xhx.common.pdu.holiday.HolidayPdu;
+import com.mortals.xhx.common.pdu.window.WindowPdu;
+import com.mortals.xhx.feign.IFeign;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+/**
+ * 大厅窗口 Feign接口
+ */
+@FeignClient(name = "base-manager", path = "/base", fallbackFactory = WindowFeignFallbackFactory.class)
+public interface IWindowFeign extends IFeign {
+
+    @PostMapping(value = "/window/interlist")
+    Rest<RespData<List<WindowPdu>>> list(@RequestBody WindowPdu windowPdu);
+}
+
+@Slf4j
+@Component
+class WindowFeignFallbackFactory implements FallbackFactory<IWindowFeign> {
+
+    @Override
+    public IWindowFeign create(Throwable cause) {
+        return new IWindowFeign(){
+
+            @Override
+            public Rest<RespData<List<WindowPdu>>> list(WindowPdu windowPdu) {
+                return Rest.fail("暂时无法访问窗口列表接口，请稍后再试!");
+            }
+        };
+    }
+}