Merge branch 'f-xiaogu' into dev

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/service/impl/ReportServiceImpl.java

@@ -115,9 +115,9 @@ public class ReportServiceImpl implements IReportService {
             // 0、文本标题
             NpoiHelper.title(document, res.getXmmc() + "选址报告", pos++);
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy年MM月dd日");
-            NpoiHelper.Option optionCENTER = new NpoiHelper.Option();
-            optionCENTER.setAlign(ParagraphAlignment.CENTER);
-            document.setParagraph(NpoiHelper.newParagraph(document, sdf.format(new Date()), optionCENTER), pos++);
+            // NpoiHelper.Option optionCENTER = new NpoiHelper.Option();
+            // optionCENTER.setAlign(ParagraphAlignment.CENTER);
+            // document.setParagraph(NpoiHelper.newParagraph(document, sdf.format(new Date()), optionCENTER), pos++);
 
             // 1、项目选址信息
             NpoiHelper.catalog(document, "一、项目选址信息", pos++);
@@ -128,6 +128,7 @@ public class ReportServiceImpl implements IReportService {
             listTemp.add("\t建设单位：" + res.getJsdw());
             listTemp.add("\t用地面积：" + ydmj + "亩");
             listTemp.add("\t用地性质：" + res.getYdmc());
+            listTemp.add("\t分析时间：" + sdf.format(new Date()));
             listTemp.add("\t影响因子：");
             NpoiHelper.content(document, listTemp, pos++);
             List tabYzTitles = new ArrayList<NpoiHelper.TableTitle>();

onemap-modules/onemap-analyse/src/main/resources/mapper/oracle/fzss/FzxzMapper.xml

@@ -32,21 +32,21 @@
         order by t.cjsj desc
     </select>
     <select id="GetFzxzByBsm" parameterType="java.lang.String" resultType="com.onemap.analyse.domain.FzxzEntityDTO">
-        select t.bsm                        as "bsm",
-               t.sjy                        as "sjy",
-               sjy.sjymc                       "sjymc",
-               t.ydxz_bsm                   as "ydbsm",
+        select t.bsm                         as "bsm",
+               t.sjy                         as "sjy",
+               sjy.sjymc                        "sjymc",
+               t.ydxz_bsm                    as "ydbsm",
                (select dict.mc
                 from t_fzss_fzxz_dict dict
                 where dict.dm = t.ydxz_bsm
-                  and dict.fzbs = sjy.fzbs) as "ydmc",
-               t.ydmjbegin                  as "ydmjbegin",
-               t.ydmjend                    as "ydmjend",
-               t.xmmc                       as "xmmc",
-               t.jsdw                       as "jsdw",
-               t.fxbg                       as "fxbg",
-               t.rwzt                       as "rwzt",
-               t.geom_id                    as "geomId"
+                  and dict.fzbs = sjy.fzbs)  as "ydmc",
+               t.ydmjbegin                   as "ydmjbegin",
+               t.ydmjend                     as "ydmjend",
+               t.xmmc                        as "xmmc",
+               t.jsdw                        as "jsdw",
+               t.fxbg                        as "fxbg",
+               t.rwzt                        as "rwzt",
+               t.geom_id                     as "geomId"
         from t_fzss_fzxz t
                  left join t_fzss_fzxz_sjy sjy on sjy.bsm = t.sjy
         where t.bsm = #{bsm}